Merge lp:~roryj/slingshot/fix-1356641 into lp:~elementary-pantheon/slingshot/trunk

[Rory]

Check if visible before grabbing device. Fixes bug #1356641.

Check if visible before grabbing device. Fixes bug #1356641.

[Julián Unrrein (junrrein)]

I can still replicate the issue, but it's a lot harder to do so. I have to click around 30 times in a row to make it hang.

[lp:~roryj/slingshot/fix-1356641]

450. By Rory on 2014-08-31

Check if visible before grabbing device.

[Rory (roryj)]

Finally managed to recreate it... I think this should of fixed it?

[Julián Unrrein (junrrein)]

Indeed it is fixed now. Code is good too. Good work!

review: Approve

=== modified file 'src/SlingshotView.vala'
--- src/SlingshotView.vala	2014-07-10 09:40:47 +0000
+++ src/SlingshotView.vala	2014-08-31 21:38:45 +0000
@@ -242,7 +242,9 @@
             if (pointer_status != Gdk.GrabStatus.SUCCESS || keyboard_status != Gdk.GrabStatus.SUCCESS)  {
                 // If grab failed, retry again. Happens when "Applications" button is long held.
                 Timeout.add (100, () => {
-                    grab_device ();
+                    if (visible)
+                        grab_device ();
+
                     return false;
                 });
             }
@@ -262,7 +264,8 @@
         }
 
         public override bool map_event (Gdk.EventAny event) {
-            grab_device ();
+            if (visible)
+                grab_device ();
 
             return false;
         }