modified:

 unity-private/launcher/scroller-controller.vala Merged branch unity.fix-632460 after review and approval from Gordon. This avoids the crash on Super-key-shortcuts with places. Fixes LP: #632460 (bzr r502)

1 files changed, 9 insertions, 1 deletions

diff --git a/unity-private/launcher/scroller-controller.vala b/unity-private/launcher/scroller-controller.vala
index abee8caa6..833338dfa 100644
--- a/unity-private/launcher/scroller-controller.vala
+++ b/unity-private/launcher/scroller-controller.vala
@@ -81,7 +81,15 @@ namespace Unity.Launcher
 Unity.global_shell.super_key_active = false;
 
 var childcontroller = get_controller_for_view (model[index]);
- childcontroller.activate ();
+ if (childcontroller is ScrollerChildController)
+ { 
+ childcontroller.activate ();
+ }
+ else
+ {
+ // FIXME
+ warning ("get_controller_for_view() returned NULL\n");
+ }
 }
 
 uint super_key_source = 0;