Merge lp:~smspillaz/unity/unity.fix_835259 into lp:unity

[Sam Spilsbury]

Fix bug 835259

There's a race condition that can happen here where compiz would have already destroyed the window before bamf knows about the window being destroyed, so it will still be in bamf_view_get_children

[Jason Smith (jassmith)]

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-29 07:45:55 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-29 15:22:14 +0000
@@ -634,9 +634,12 @@
     for (LayoutWindow::Ptr target : targets)
     {
       CompWindow* window = screen->findWindow(target->xid);
-      UnityWindow *unity_window = UnityWindow::get (window);
+      if (window)
+      {
+        UnityWindow *unity_window = UnityWindow::get (window);
 
-      unity_window->paintThumbnail (target->result, target->alpha);
+        unity_window->paintThumbnail (target->result, target->alpha);
+      }
     }
   }