From 12c0d53192b0b868ed8c02c72f6ebf08b9100055 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Thu, 24 Aug 2017 22:58:34 +0200
Subject: [PATCH] FMenuItem accelerator fix

---
 src/fmenuitem.cpp | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/fmenuitem.cpp b/src/fmenuitem.cpp
index 628ebd1e..a73a593d 100644
--- a/src/fmenuitem.cpp
+++ b/src/fmenuitem.cpp
@@ -595,21 +595,24 @@ void FMenuItem::onAccel (FAccelEvent* ev)
     {
       FFocusEvent out (fc::FocusOut_Event);
       FApplication::queueEvent(focused_widget, &out);
-      menu->unselectItem();
-      menu->selectFirstItem();
-
-      if ( menu->getSelectedItem() )
-        menu->getSelectedItem()->setFocus();
-
-      focused_widget->redraw();
-      menu->redraw();
-
-      if ( getStatusBar() )
-        getStatusBar()->drawMessage();
-
-      mbar->redraw();
-      mbar->drop_down = true;
     }
+
+    menu->unselectItem();
+    menu->selectFirstItem();
+
+    if ( menu->getSelectedItem() )
+      menu->getSelectedItem()->setFocus();
+
+    if ( focused_widget && focused_widget->isWidget() )
+      focused_widget->redraw();
+
+    menu->redraw();
+
+    if ( getStatusBar() )
+      getStatusBar()->drawMessage();
+
+    mbar->redraw();
+    mbar->drop_down = true;
   }
   else
   {