* If a button/key is pressed and the shortcut hint is open close it!

(bzr r3494.4.1)

1 files changed, 10 insertions, 0 deletions

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 4699b472a..d739f9dec 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1519,6 +1519,11 @@ void UnityScreen::handleEvent(XEvent* event)
 }
 break;
 case ButtonPress:
+ if (shortcut_controller_->Visible())
+ {
+ shortcut_controller_->Hide();
+ }
+
 if (super_keypressed_)
 {
 launcher_controller_->KeyNavTerminate(false);
@@ -1609,6 +1614,11 @@ void UnityScreen::handleEvent(XEvent* event)
 break;
 case KeyPress:
 {
+ if (shortcut_controller_->Visible())
+ {
+ shortcut_controller_->Hide();
+ }
+
 if (super_keypressed_)
 {
 /* We need an idle to postpone this action, after the current event