2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 79e0654..03a68db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
  (Format: Year/Month/Day)
 Changes for 1.0rc3:
 *07/01/14:
+   * Properly 'properly fix' shaded and stuck windows on restart -- i.e. allow
+     windows to deiconify themselves the rest of the time (Mark)
+     Window.cc
    * Several changes for background style option: (Mark)
      - now support `background: mod' to coincide with fbsetroot -mod --
        In addition to `background.color' and `background.colorTo', this option
diff --git a/src/Window.cc b/src/Window.cc
index a3a10c5..642a76b 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -2479,7 +2479,8 @@ void FluxboxWindow::mapRequestEvent(XMapRequestEvent &re) {
             destroyed = wsp->checkGrouping(*this);
 
         // if we weren't grouped with another window we deiconify ourself
-        if (!destroyed && !iconic)
+        // make sure iconified windows stay that way on fluxbox start
+        if (!destroyed && !(iconic && Fluxbox::instance()->isStartup()))
             deiconify(false);
 
     }