Merge with 6e384f1d399717d5c68fca35de1f00394a6f1d58

2014-03-05 21:04:53 +01:00
parent 9ab0d2b2f3
commit 518a318822
36 changed files with 1168 additions and 529 deletions
--- a/rtgui/toolbar.cc
+++ b/rtgui/toolbar.cc
@@ -257,8 +257,11 @@ bool ToolBar::handleShortcutKey (GdkEventKey* event) {
        switch(event->keyval) {
            case GDK_w:
            case GDK_W:
-                wb_pressed ();
-                return true;
+            	if(wbTool){
+					wb_pressed ();
+					return true;
+            	}
+				return false;
            case GDK_c:
            case GDK_C:
                crop_pressed ();