Merge lp:~gerboland/unity-2d/no-active-window-crash into lp:unity-2d

[Gerry Boland]

Crash fix: Bamf can return NULL if there is no active window. Check BamfWindow* is not null before getting the window ID.

UNBLOCK

[Albert Astals Cid (aacid)]

Should
if (active_window != this->effectiveWinId()) {
be extended to
if (active_window != this->effectiveWinId() && active_window != None) {
?

Or maybe just
Q_EMIT lastFocusedWindowChanged(m_last_focused_window);
if m_last_focused_window != active_window?

review: Needs Fixing

[lp:~gerboland/unity-2d/no-active-window-crash]

946. By Gerry Boland on 2012-03-02

Might as well add check only emit signal if last_focused_window actually changes

[Albert Astals Cid (aacid)]

Makes sense :-)

review: Approve

=== modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	2012-02-27 10:47:50 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2012-03-02 12:04:26 +0000
@@ -270,8 +270,16 @@
        different by 1, which then could not be used with Bamf to
        get the application. The change does not result in any functional
        differences, though. */
-    WId active_window = BamfMatcher::get_default().active_window()->xid();
-    if (active_window != this->effectiveWinId()) {
+    WId active_window = None;
+    BamfWindow* bamf_active_window = BamfMatcher::get_default().active_window();
+
+    /* Bamf can return a null active window - example case is just after 
+       login when no application has been yet been started. */
+    if (bamf_active_window != NULL) {
+        active_window = bamf_active_window->xid();
+    }
+
+    if (active_window != this->effectiveWinId() && active_window != m_last_focused_window) {
         m_last_focused_window = active_window;
         Q_EMIT lastFocusedWindowChanged(m_last_focused_window);
     }

=== modified file 'tests/manual-tests/dash.txt'
--- tests/manual-tests/dash.txt	2012-02-28 12:00:25 +0000
+++ tests/manual-tests/dash.txt	2012-03-02 12:04:26 +0000
@@ -6,6 +6,13 @@
     small, Dash should be locked to full-screen mode. (lp:860400)
 
 ----
+ * Newly installed Ubuntu, first boot to Unity 2D session
+ * No applications have yet started or windows appear
+ * Click the BFB in the Launcher *OR* Tap Alt to open HUD
+
+--> Shell should not crash. (lp:944724)
+
+----
  * Press Alt+F2
 
 --> Dash opens and "Run a command" is shown in the search field - (lp:883392)