From 46ca336cb3919e0d89c7cb360de0013a8d12a5a7 Mon Sep 17 00:00:00 2001
From: Morgan Hardwood <bugs@londonlight.org>
Date: Sat, 2 Sep 2017 21:29:32 +0200
Subject: [PATCH] Fix needed after merging dev into bgcolor-h

---
 rtgui/editorpanel.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/rtgui/editorpanel.cc b/rtgui/editorpanel.cc
index 71d0729e6..f1835be89 100644
--- a/rtgui/editorpanel.cc
+++ b/rtgui/editorpanel.cc
@@ -1581,11 +1581,7 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event)
                     return true;
 
                 case GDK_KEY_F: //preview mode Focus Mask
-                    iareapanel->imageArea->previewModePanel->toggleFocusMask();
-                    return true;
-
-                case GDK_KEY_f:
-                    iareapanel->imageArea->zoomPanel->zoomFitClicked();
+                    iareapanel->imageArea->indClippedPanel->toggleFocusMask();
                     return true;
 
                 case GDK_KEY_less:
@@ -1596,6 +1592,10 @@ bool EditorPanel::handleShortcutKey (GdkEventKey* event)
                     iareapanel->imageArea->indClippedPanel->toggleClipped (true);
                     return true;
 
+                case GDK_KEY_f:
+                    iareapanel->imageArea->zoomPanel->zoomFitClicked();
+                    return true;
+
                 case GDK_KEY_F5:
                     openThm->openDefaultViewer ((event->state & GDK_SHIFT_MASK) ? 2 : 1);
                     return true;