diff options
| author | Martin Owens <doctormo@gmail.com> | 2014-01-20 01:30:15 +0000 |
|---|---|---|
| committer | Martin Owens <doctormo@gmail.com> | 2014-01-20 01:30:15 +0000 |
| commit | cca2c219973a60fb6535836559aa42ec2b9cb630 (patch) | |
| tree | 0499397b36d3892b8b5bb98c483a782e1ed5fdc8 /src/selection-chemistry.cpp | |
| parent | Allow undo methods to survive a non-sensitive call. (diff) | |
| download | inkscape-cca2c219973a60fb6535836559aa42ec2b9cb630.tar.gz inkscape-cca2c219973a60fb6535836559aa42ec2b9cb630.zip | |
Revert changes from r12959 and r12955, impliment new stratedgy to fix bug #168695
Fixed bugs:
- https://launchpad.net/bugs/168695
(bzr r12960)
Diffstat (limited to 'src/selection-chemistry.cpp')
| -rw-r--r-- | src/selection-chemistry.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp index f9649d62f..1957b9297 100644 --- a/src/selection-chemistry.cpp +++ b/src/selection-chemistry.cpp @@ -1083,6 +1083,9 @@ void sp_selection_lower_to_bottom(Inkscape::Selection *selection, SPDesktop *des void sp_undo(SPDesktop *desktop, SPDocument *) { + // No re/undo while dragging, too dangerous. + if(desktop->getEventContext()->is_dragging) return; + if (!DocumentUndo::undo(sp_desktop_document(desktop))) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to undo.")); } @@ -1091,6 +1094,9 @@ sp_undo(SPDesktop *desktop, SPDocument *) void sp_redo(SPDesktop *desktop, SPDocument *) { + // No re/undo while dragging, too dangerous. + if(desktop->getEventContext()->is_dragging) return; + if (!DocumentUndo::redo(sp_desktop_document(desktop))) { desktop->messageStack()->flash(Inkscape::WARNING_MESSAGE, _("Nothing to redo.")); } |