[umbrello-devel] [umbrello] [Bug 329648] Crash on undo after source code import

[Ralf Habacker]

https://bugs.kde.org/show_bug.cgi?id=329648

--- Comment #7 from Ralf Habacker <ralf.habacker at freenet.de> ---
Git commit 4df83c1bd7ce868e0d3f76aed793b8c1851f696e by Ralf Habacker.
Committed on 12/01/2014 at 14:47.
Pushed by habacker into branch 'KDE/4.11'.

Disable undo while code importing to not pollute the undo stack.
(cherry picked from commit fd26bdd22cff46d765300f6e5dec005a240e5405)

M  +9    -0    umbrello/codeimpwizard/codeimpstatuspage.cpp
M  +1    -0    umbrello/codeimpwizard/codeimpstatuspage.h

http://commits.kde.org/umbrello/4df83c1bd7ce868e0d3f76aed793b8c1851f696e

--- Comment #6 from Ralf Habacker <ralf.habacker at freenet.de> ---
Git commit 732d15083de5a2d92e18e5c234efc706dab7d8a9 by Ralf Habacker.
Committed on 12/01/2014 at 14:03.
Pushed by habacker into branch 'KDE/4.11'.

Made 'Enable/Disable Undo' setting real working.
(cherry picked from commit 1281519196b65fd226b8812972cf6df8e9acd4be)

Conflicts:
    umbrello/listpopupmenu.cpp
    umbrello/uml.cpp

M  +2    -2    umbrello/listpopupmenu.cpp
M  +87   -44   umbrello/uml.cpp
M  +10   -4    umbrello/uml.h
M  +2    -2    umbrello/umldoc.cpp

http://commits.kde.org/umbrello/732d15083de5a2d92e18e5c234efc706dab7d8a9

-- 
You are receiving this mail because:
You are the assignee for the bug.