Merge lp:~compiz-team/compiz-grid-plugin/oneiric.fix_834585 into lp:~compiz-team/compiz-grid-plugin/oneiric

[Sam Spilsbury]

Fix bug 834585

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'src/grid.cpp'
--- src/grid.cpp	2011-10-02 13:30:13 +0000
+++ src/grid.cpp	2011-10-05 17:50:28 +0000
@@ -705,20 +705,23 @@
 			if (edge != NoEdge && check)
 			{
 				CompWindow *cw = screen->findWindow (screen->activeWindow ());
-				animations.push_back (Animation ());
-				int current = animations.size () - 1;
-				animations.at (current).fromRect	= cw->serverBorderRect ();
-				animations.at (current).currentRect	= cw->serverBorderRect ();
-				animations.at (current).timer = animations.at (current).duration;
-				animations.at (current).targetRect = desiredSlot;
-
-				if (lastEdge == NoEdge || !animating)
+				if (cw)
 				{
+				    animations.push_back (Animation ());
+				    int current = animations.size () - 1;
+				    animations.at (current).fromRect	= cw->serverBorderRect ();
+				    animations.at (current).currentRect	= cw->serverBorderRect ();
+				    animations.at (current).timer = animations.at (current).duration;
+				    animations.at (current).targetRect = desiredSlot;
+
+				    if (lastEdge == NoEdge || !animating)
+				    {
 					/* Cursor has entered edge region from non-edge region */
 					animating = true;
 					glScreen->glPaintOutputSetEnabled (this, true);
 					cScreen->preparePaintSetEnabled (this, true);
 					cScreen->donePaintSetEnabled (this, true);
+				    }
 				}
 			}
 		}