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

[Sam Spilsbury]

Fix bug 931409

Don't unset the handlers until the window is destroyed.

[Tim Penhey (thumper)]

Tested.

review: Approve

=== modified file 'plugins/unityshell/src/compizminimizedwindowhandler.h'
--- plugins/unityshell/src/compizminimizedwindowhandler.h	2012-02-13 03:27:45 +0000
+++ plugins/unityshell/src/compizminimizedwindowhandler.h	2012-02-14 04:41:55 +0000
@@ -104,15 +104,6 @@
 template <typename Screen, typename Window>
 compiz::CompizMinimizedWindowHandler<Screen, Window>::~CompizMinimizedWindowHandler ()
 {
-  if (!priv->mWindow->destroyed ())
-  {
-    priv->mWindow->unminimize ();
-    priv->mWindow->focusSetEnabled (Window::get (priv->mWindow), false);
-    priv->mWindow->minimizeSetEnabled (Window::get (priv->mWindow), false);
-    priv->mWindow->unminimizeSetEnabled (Window::get (priv->mWindow), false);
-    priv->mWindow->minimize ();
-  }
-
   minimizedWindows.remove (this);
 }
 
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-02-13 21:44:54 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-02-14 04:41:55 +0000
@@ -2687,6 +2687,18 @@
   if (us->newFocusedWindow && (UnityWindow::get(us->newFocusedWindow) == this))
     us->newFocusedWindow = NULL;
 
+  if (!window->destroyed ())
+  {
+    bool wasMinimized = window->minimized ();
+    if (wasMinimized)
+      window->unminimize ();
+    window->focusSetEnabled (this, false);
+    window->minimizeSetEnabled (this, false);
+    window->unminimizeSetEnabled (this, false);
+    if (wasMinimized)
+      window->minimize ();
+  }
+
   UnityShowdesktopHandler::animating_windows.remove (window);
 
   if (mShowdesktopHandler)