diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-10-12 17:18:08 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-10-12 17:18:08 +0000 |
| commit | d997c6a08a0d1184e8a4aec708033d0f548802f8 (patch) | |
| tree | e644b11bedb210813006dbfe4fb6a703bb642fae /src/extension/input.cpp | |
| parent | merge from trunk (r11761) (diff) | |
| parent | Fix for compiling with pre gtkmm 2.24 libraries. (diff) | |
| download | inkscape-d997c6a08a0d1184e8a4aec708033d0f548802f8.tar.gz inkscape-d997c6a08a0d1184e8a4aec708033d0f548802f8.zip | |
merge from trunk (r11787)
(bzr r11668.1.28)
Diffstat (limited to 'src/extension/input.cpp')
| -rw-r--r-- | src/extension/input.cpp | 7 |
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 */ |