2 files changed, 5 insertions, 2 deletions

diff --git a/src/Screen.cc b/src/Screen.cc
index e579136..88c764d 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Screen.cc,v 1.160 2003/05/13 00:23:05 fluxgen Exp $
+// $Id: Screen.cc,v 1.161 2003/05/13 11:14:04 rathnor Exp $
 
 
 #include "Screen.hh"
@@ -2491,6 +2491,7 @@ WinClient *BScreen::getLastFocusedWindow(int workspace) {
     for (; it != it_end; ++it)
         if ((*it)->fbwindow() &&
             (((int)(*it)->fbwindow()->getWorkspaceNumber()) == workspace 
+             && !(*it)->fbwindow()->isIconic()
              && (!(*it)->fbwindow()->isStuck() || (*it)->fbwindow()->isFocused())))
             // only give focus to a stuck window if it is currently focused
             // otherwise they tend to override normal workspace focus
diff --git a/src/Window.cc b/src/Window.cc
index 4410f5a..1c47fa7 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Window.cc,v 1.172 2003/05/11 23:44:08 rathnor Exp $
+// $Id: Window.cc,v 1.173 2003/05/13 11:14:05 rathnor Exp $
 
 #include "Window.hh"
 
@@ -1240,6 +1240,8 @@ void FluxboxWindow::iconify() {
                     (*it)->fbwindow()->iconify();
         }
     }
+    if (Fluxbox::instance()->getFocusedWindow() == this) 
+        Fluxbox::instance()->revertFocus(screen());
 
 }