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/document-undo.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 '')
| -rw-r--r-- | src/document-undo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/document-undo.cpp b/src/document-undo.cpp index 4a4156a70..39c8a04a0 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_return_if_fail(doc->priv->sensitive); + g_assert (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_return_if_fail(doc->priv->sensitive); + g_assert (doc->priv->sensitive); sp_repr_rollback (doc->rdoc); @@ -242,7 +242,7 @@ gboolean Inkscape::DocumentUndo::undo(SPDocument *doc) g_assert (doc != NULL); g_assert (doc->priv != NULL); - g_return_val_if_fail (doc->priv->sensitive, FALSE); + g_assert (doc->priv->sensitive); doc->priv->sensitive = FALSE; doc->priv->seeking = true; @@ -287,7 +287,7 @@ gboolean Inkscape::DocumentUndo::redo(SPDocument *doc) g_assert (doc != NULL); g_assert (doc->priv != NULL); - g_return_val_if_fail(doc->priv->sensitive, FALSE); + g_assert (doc->priv->sensitive); doc->priv->sensitive = FALSE; doc->priv->seeking = true; |