summaryrefslogtreecommitdiffstats
path: root/src/zoom-context.cpp
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-09-02 23:44:27 +0000
committerJohn Smith <john.smith7545@yahoo.com>2012-09-02 23:44:27 +0000
commitbd9e980c59453168a9d55a093564421b593e186e (patch)
tree6e577b37f7eb020878b2aa7a0cee482c685c4835 /src/zoom-context.cpp
parentconverted some c-string usage to c++ string class usage: should fix some memo... (diff)
downloadinkscape-bd9e980c59453168a9d55a093564421b593e186e.tar.gz
inkscape-bd9e980c59453168a9d55a093564421b593e186e.zip
Fix for 406044 : Esc with no selection, activates selection tool
(bzr r11647)
Diffstat (limited to 'src/zoom-context.cpp')
-rw-r--r--src/zoom-context.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/zoom-context.cpp b/src/zoom-context.cpp
index 90a091440..58eefe97a 100644
--- a/src/zoom-context.cpp
+++ b/src/zoom-context.cpp
@@ -22,6 +22,7 @@
#include "pixmaps/cursor-zoom.xpm"
#include "pixmaps/cursor-zoom-out.xpm"
#include "preferences.h"
+#include "selection-chemistry.h"
#include "zoom-context.h"
@@ -216,6 +217,9 @@ static gint sp_zoom_context_root_handler(SPEventContext *event_context, GdkEvent
case GDK_KEY_PRESS:
switch (get_group0_keyval (&event->key)) {
case GDK_KEY_Escape:
+ if (!Inkscape::Rubberband::get(desktop)->is_started()) {
+ Inkscape::SelectionHelper::selectNone(desktop);
+ }
Inkscape::Rubberband::get(desktop)->stop();
xp = yp = 0;
escaped = true;