From 9f50a2b092e521634ceec0a9b06369d6a04708b2 Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sun, 19 Jan 2014 16:18:27 -0500 Subject: Allow undo methods to survive a non-sensitive call. (bzr r12959) --- src/document-undo.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/document-undo.cpp') diff --git a/src/document-undo.cpp b/src/document-undo.cpp index bad4d6c81..4a4156a70 100644 --- a/src/document-undo.cpp +++ b/src/document-undo.cpp @@ -155,7 +155,7 @@ void Inkscape::DocumentUndo::maybeDone(SPDocument *doc, const gchar *key, const { g_assert (doc != NULL); g_assert (doc->priv != NULL); - g_assert (doc->priv->sensitive); + g_return_if_fail(doc->priv->sensitive); if ( key && !*key ) { g_warning("Blank undo key specified."); } @@ -204,7 +204,7 @@ void Inkscape::DocumentUndo::cancel(SPDocument *doc) { g_assert (doc != NULL); g_assert (doc->priv != NULL); - g_assert (doc->priv->sensitive); + g_return_if_fail(doc->priv->sensitive); sp_repr_rollback (doc->rdoc); @@ -287,7 +287,7 @@ gboolean Inkscape::DocumentUndo::redo(SPDocument *doc) g_assert (doc != NULL); g_assert (doc->priv != NULL); - g_assert (doc->priv->sensitive); + g_return_val_if_fail(doc->priv->sensitive, FALSE); doc->priv->sensitive = FALSE; doc->priv->seeking = true; -- cgit v1.2.3