From fe4cd695af624b9c3e0c54eea3adbc16746e2540 Mon Sep 17 00:00:00 2001
From: dan <dan>
Date: Mon, 24 Feb 2003 04:06:20 +0000
Subject: [PATCH] - Fixed a bug with deminiaturizing windows when the
 application is hidden and   the miniaturized window is selected from the
 window list menu

---
 ChangeLog     |  2 ++
 src/actions.c | 15 +++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d7403a5..61de508e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,8 @@ Changes since version 0.80.2:
   patch (Peter Zijlstra <a.p.zijlstra@chello.nl>)
 - Fixed bug with cursor locked in drag mode after Alt-dragging a window
 - Added Catalan translation (Ernest Adrogué <eadrogue@gmx.net>)
+- Fixed a bug with deminiaturizing windows when the application is hidden and
+  the miniaturized window is selected from the window list menu
 
 
 Changes since version 0.80.1:
diff --git a/src/actions.c b/src/actions.c
index 8365ded6..50d6c953 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1403,10 +1403,12 @@ wUnhideApplication(WApplication *wapp, Bool miniwindows, Bool bringToCurrentWS)
                 if (bringToCurrentWS)
                     wWindowChangeWorkspace(wlist, scr->current_workspace);
                 wlist->flags.hidden = 0;
-                if (miniwindows &&
-                    wlist->frame->workspace == scr->current_workspace) {
-                    wUnshadeWindow(wlist);
-                    wRaiseFrame(wlist->frame->core);
+                if (wlist->frame->workspace == scr->current_workspace) {
+                    XMapWindow(dpy, wlist->frame->core->window);
+                    if (miniwindows) {
+                        wUnshadeWindow(wlist);
+                        wRaiseFrame(wlist->frame->core);
+                    }
                 }
                 WMPostNotificationName(WMNChangedState, wlist, "hide");
 	    } else if (wlist->flags.hidden) {
@@ -1685,7 +1687,7 @@ wMakeWindowVisible(WWindow *wwin)
 	wWorkspaceChange(wwin->screen_ptr, wwin->frame->workspace);
 
     if (wwin->flags.shaded) {
-	wUnshadeWindow(wwin);
+        wUnshadeWindow(wwin);
     }
     if (wwin->flags.hidden) {
 	WApplication *app;
@@ -1696,7 +1698,8 @@ wMakeWindowVisible(WWindow *wwin)
             app->last_focused = wwin;
             wUnhideApplication(app, False, False);
         }
-    } else if (wwin->flags.miniaturized) {
+    }
+    if (wwin->flags.miniaturized) {
 	wDeiconifyWindow(wwin);
     } else {
 	if (!WFLAGP(wwin, no_focusable))
-- 
2.11.4.GIT