summaryrefslogtreecommitdiffstats
path: root/src/extension/input.cpp
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-10-11 03:34:08 +0000
committerJohn Smith <john.smith7545@yahoo.com>2012-10-11 03:34:08 +0000
commit05c9f6824d14012a71528bd204bcdd4e6624db29 (patch)
tree3df43f36edb9c89ba3ffce431c81b0e16e322b4e /src/extension/input.cpp
parentFix for 246153 : Broken style indicator (diff)
downloadinkscape-05c9f6824d14012a71528bd204bcdd4e6624db29.tar.gz
inkscape-05c9f6824d14012a71528bd204bcdd4e6624db29.zip
Fix for 426763 : Cancelling import leads to error message
(bzr r11777)
Diffstat (limited to 'src/extension/input.cpp')
-rw-r--r--src/extension/input.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/extension/input.cpp b/src/extension/input.cpp
index 1662ef073..5cef38009 100644
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
@@ -152,6 +152,10 @@ Input::open (const gchar *uri)
SPDocument *const doc = imp->open(this, uri);
+ if (imp->wasCancelled()) {
+ throw Input::open_cancelled();
+ }
+
return doc;
}
@@ -227,8 +231,7 @@ Input::prefs (const gchar *uri)
delete dialog;
- if (response == Gtk::RESPONSE_OK) return true;
- return false;
+ return (response == Gtk::RESPONSE_OK);
}
} } /* namespace Inkscape, Extension */