Make sure we check if the Quicklist or Alt+F1 key nav is open (so we can close them)

Bore checking if something as a WM grab. As we cant open the hud is in Quicklist or KeyNav anymore. Fixes: 1353167 Approved by: PS Jenkins bot, Marco Trevisan (Treviño) (bzr r3853)

1 files changed, 10 insertions, 10 deletions

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 16ca2e17c..00d9f97e8 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -2512,6 +2512,16 @@ bool UnityScreen::ShowHud()
 }
 else
 {
+ // Handles closing KeyNav (Alt+F1) if the hud is about to show
+ if (launcher_controller_->KeyNavIsActive())
+ launcher_controller_->KeyNavTerminate(false);
+
+ if (dash_controller_->IsVisible())
+ dash_controller_->HideDash();
+
+ if (QuicklistManager::Default()->Current())
+ QuicklistManager::Default()->Current()->Hide();
+
 auto& wm = WindowManager::Default();
 
 if (wm.IsTopWindowFullscreenOnMonitorWithMouse())
@@ -2530,16 +2540,6 @@ bool UnityScreen::ShowHud()
 return false;
 }
 
- // Handles closing KeyNav (Alt+F1) if the hud is about to show
- if (launcher_controller_->KeyNavIsActive())
- launcher_controller_->KeyNavTerminate(false);
-
- if (dash_controller_->IsVisible())
- dash_controller_->HideDash();
-
- if (QuicklistManager::Default()->Current())
- QuicklistManager::Default()->Current()->Hide();
-
 hud_ungrab_slot_->disconnect();
 hud_controller_->ShowHud();
 }