Merge lp:~mrasmus/unity/fix-713632 into lp:unity

[Matthew Rasmus]

[Jason Smith (jassmith)]

+1

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-02-11 16:40:12 +0000
+++ src/Launcher.cpp	2011-02-13 23:09:11 +0000
@@ -190,6 +190,7 @@
     OnMouseMove.connect  (sigc::mem_fun (this, &Launcher::RecvMouseMove));
     OnMouseWheel.connect (sigc::mem_fun (this, &Launcher::RecvMouseWheel));
     OnKeyPressed.connect (sigc::mem_fun (this, &Launcher::RecvKeyPressed));
+    OnEndFocus.connect   (sigc::mem_fun (this, &Launcher::exitKeyNavMode));
 
     QuicklistManager::Default ()->quicklist_opened.connect (sigc::mem_fun(this, &Launcher::RecvQuicklistOpened));
     QuicklistManager::Default ()->quicklist_closed.connect (sigc::mem_fun(this, &Launcher::RecvQuicklistClosed));
@@ -360,6 +361,8 @@
 void
 Launcher::exitKeyNavMode ()
 {
+  if (!_navmod_show_launcher)
+    return;
     
   _navmod_show_launcher = false;
   EnsureHiddenState ();