https://bugs.kde.org/show_bug.cgi?id=366607
Boudewijn Rempt <b...@valdyas.org> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|UNCONFIRMED |RESOLVED Latest Commit| |http://commits.kde.org/krit | |a/68ca0a9afba1693d7f1a6234c | |605ff7233522dd5 Resolution|--- |FIXED --- Comment #11 from Boudewijn Rempt <b...@valdyas.org> --- Git commit 68ca0a9afba1693d7f1a6234c605ff7233522dd5 by Boudewijn Rempt. Committed on 19/09/2016 at 11:09. Pushed by rempt into branch 'master'. Wrap the undo commands in a QPointer This should fix the problems when trying to merge already deleted commands in the timedMergeWith method, because now we can track whether the QObject-based KUndo2Command instances have been deleted behind our back. M +4 -2 libs/image/commands_new/kis_change_projection_color_command.cpp M +2 -2 libs/image/commands_new/kis_change_projection_color_command.h M +15 -10 libs/image/commands_new/kis_saved_commands.cpp M +5 -5 libs/image/commands_new/kis_saved_commands.h M +4 -2 libs/image/commands_new/kis_switch_current_time_command.cpp M +2 -2 libs/image/commands_new/kis_switch_current_time_command.h M +11 -17 libs/kundo2/kundo2command.cpp M +4 -6 libs/kundo2/kundo2command.h M +19 -10 libs/kundo2/kundo2stack.cpp M +5 -3 libs/kundo2/kundo2stack.h M +5 -5 libs/ui/canvas/kis_change_guides_command.cpp M +2 -2 libs/ui/canvas/kis_change_guides_command.h M +1 -1 plugins/flake/textshape/TextTool.cpp M +1 -1 plugins/flake/textshape/commands/ChangeListLevelCommand.cpp M +1 -1 plugins/flake/textshape/commands/ChangeListLevelCommand.h M +1 -0 plugins/flake/textshape/kotext/KoTextCommandBase.h M +1 -1 plugins/flake/textshape/kotext/KoTextEditor_undo.cpp M +1 -1 plugins/flake/textshape/kotext/OdfTextTrackStyles.cpp M +2 -2 plugins/flake/textshape/kotext/commands/ChangeListCommand.cpp M +1 -1 plugins/flake/textshape/kotext/commands/ChangeListCommand.h M +5 -2 plugins/flake/textshape/kotext/commands/DeleteCommand.cpp M +1 -1 plugins/flake/textshape/kotext/commands/DeleteCommand.h M +1 -1 plugins/flake/textshape/kotext/commands/ListItemNumberingCommand.cpp M +1 -1 plugins/flake/textshape/kotext/commands/ListItemNumberingCommand.h M +3 -3 plugins/flake/textshape/kotext/commands/RenameSectionCommand.cpp M +1 -1 plugins/flake/textshape/kotext/commands/RenameSectionCommand.h http://commits.kde.org/krita/68ca0a9afba1693d7f1a6234c605ff7233522dd5 -- You are receiving this mail because: You are watching all bug changes.