Fix up show desktop mode and minimizeXORG-7_0_99_901

1 files changed, 13 insertions, 2 deletions

diff --git a/plugins/minimize.c b/plugins/minimize.c
index 05e3f0b9..5819fa11 100644
--- a/plugins/minimize.c
+++ b/plugins/minimize.c
@@ -590,13 +590,15 @@ minDamageWindowRect (CompWindow *w,
 
     MIN_SCREEN (w->screen);
 
-    if (initial && !w->invisible && (ms->wMask & w->type))
+    if (initial)
     {
 	MIN_WINDOW (w);
 
 	if (mw->state == IconicState)
 	{
-	    if (minGetWindowIconGeometry (w, &mw->icon))
+	    if (!w->invisible	      &&
+		(ms->wMask & w->type) &&
+		minGetWindowIconGeometry (w, &mw->icon))
 	    {
 		if (!mw->adjust)
 		{
@@ -618,6 +620,15 @@ minDamageWindowRect (CompWindow *w,
 		    addWindowDamage (w);
 		}
 	    }
+	    else
+	    {
+		moveWindow (w,
+			    w->serverX - w->attrib.x,
+			    w->serverY - w->attrib.y,
+			    FALSE);
+
+		(*w->screen->setWindowScale) (w, 1.0f, 1.0f);
+	    }
 	}
 
 	mw->newState = NormalState;