Merge lp:~aacid/unity-2d/do_not_crash_autoscrolling into lp:unity-2d

[Albert Astals Cid]

[launcher] Do not try to access item if index is -1

This fixes a crash when the mouse is on the autoscrolling area of the launcher and an application disappears
This seems like a Qt bug to me, it seems as if the property changes trigger in a way that the item delegate is half destructed and accessing it makes things explode

Do not try to access item if index is -1

This fixes a crash when the mouse is on the autoscrolling area of the launcher and an application disappears
This seems like a Qt bug to me, it seems as if the property changes trigger in a way that the item delegate is half destructed and accessing it makes things explode

[lp:~aacid/unity-2d/do_not_crash_autoscrolling]

1082. By Albert Astals Cid on 2012-04-25

test

1083. By Albert Astals Cid on 2012-04-25

add comment so people don't remove the bugfix/workaround

=== modified file 'shell/launcher/LauncherList.qml'
--- shell/launcher/LauncherList.qml	2012-04-18 07:18:14 +0000
+++ shell/launcher/LauncherList.qml	2012-04-25 09:46:20 +0000
@@ -199,7 +199,8 @@
 
         /* Display the tooltip when hovering the item only when the list
            is not moving */
-        onEntered: if (!list.moving && !list.autoScrolling && list.showMenus) showMenu()
+        // FIXME index checking should not be needed but otherwise we hit https://bugs.launchpad.net/unity-2d/+bug/988239
+        onEntered: if (!list.moving && !list.autoScrolling && list.showMenus && index != -1) showMenu()
         onExited: {
             /* When unfolded, leave enough time for the user to reach the
                menu. Necessary because there is some void between the item
@@ -255,7 +256,8 @@
         Connections {
             target: list
             onMovementStarted: item.menu.hide()
-            onAutoScrollingChanged: if (list.autoScrolling) item.menu.hide()
+            // FIXME index checking should not be needed but otherwise we hit https://bugs.launchpad.net/unity-2d/+bug/988239
+            onAutoScrollingChanged: if (list.autoScrolling && index != -1) item.menu.hide()
         }
 
         Connections {
 
=== modified file 'tests/manual-tests/launcher.txt'
--- tests/manual-tests/launcher.txt	2012-04-24 15:48:07 +0000
+++ tests/manual-tests/launcher.txt	2012-04-25 09:46:20 +0000
@@ -152,3 +152,12 @@
 
 Verify that the icon shows correctly in the launcher
 ----
+ * Have the launcher in always shown mode
+ * Have the launcher with more items that it can hold in screen (i.e. it is scrollable)
+ * Put the mouse in the area of the launcher that makes it autoscroll down (and don't move it for the rest of the test)
+ * Open a program that is not in the launcher (so it creates a new tile in the launcher)
+ * Verify launcher autoscrolls down
+ * Quit the program you just started
+
+Verify that the launcher autoscrolls up (and does not crash)
+----