summaryrefslogtreecommitdiffstats
path: root/src/document-undo.cpp
diff options
context:
space:
mode:
authorMenTaLguY <mental@rydia.net>2007-03-17 23:10:37 +0000
committermental <mental@users.sourceforge.net>2007-03-17 23:10:37 +0000
commit2426c608f46f218683d91308f820b2b887af3f08 (patch)
tree1bff575ede3e852b9f68a390afb299f12859e006 /src/document-undo.cpp
parentre-introduce isEmpty tests (diff)
downloadinkscape-2426c608f46f218683d91308f820b2b887af3f08.tar.gz
inkscape-2426c608f46f218683d91308f820b2b887af3f08.zip
better way to deal with undo+id collisions
(bzr r2680)
Diffstat (limited to 'src/document-undo.cpp')
-rw-r--r--src/document-undo.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index c7da41080..0462ff374 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -7,6 +7,7 @@
* Lauris Kaplinski <lauris@kaplinski.com>
* MenTaLguY <mental@rydia.net>
*
+ * Copyright (C) 2007 MenTaLguY <mental@rydia.net>
* Copyright (C) 1999-2003 authors
* Copyright (C) 2001-2002 Ximian, Inc.
*
@@ -222,6 +223,7 @@ sp_document_undo (SPDocument *doc)
g_assert (doc->priv->sensitive);
doc->priv->sensitive = FALSE;
+ doc->priv->seeking = true;
doc->actionkey = NULL;
@@ -244,6 +246,7 @@ sp_document_undo (SPDocument *doc)
sp_repr_begin_transaction (doc->rdoc);
doc->priv->sensitive = TRUE;
+ doc->priv->seeking = false;
if (ret)
inkscape_external_change();
@@ -266,6 +269,7 @@ sp_document_redo (SPDocument *doc)
g_assert (doc->priv->sensitive);
doc->priv->sensitive = FALSE;
+ doc->priv->seeking = true;
doc->actionkey = NULL;
@@ -288,6 +292,7 @@ sp_document_redo (SPDocument *doc)
sp_repr_begin_transaction (doc->rdoc);
doc->priv->sensitive = TRUE;
+ doc->priv->seeking = false;
if (ret)
inkscape_external_change();