From 1e1d14736f40ee51ac4e631a6dad205d0711da54 Mon Sep 17 00:00:00 2001
From: Martin Duquesnoy <xorg62@gmail.com>
Date: Thu, 23 Apr 2009 21:58:42 +0200
Subject: [PATCH] Scan: Fix screen set if there is less screen than before
 reload

---
 src/layout.c | 3 +++
 src/wmfs.c   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/layout.c b/src/layout.c
index ce81e06..877e04a 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -39,6 +39,9 @@ arrange(int screen)
 {
      Client *c;
 
+     if(screen < 0 || screen > screen_count())
+          screen = screen_get_sel();
+
      for(c = clients; c; c = c->next)
           if(c->screen == screen)
           {
diff --git a/src/wmfs.c b/src/wmfs.c
index ec59a72..d9b87f5 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -222,7 +222,7 @@ scan(void)
 
                     if(tag != -1)
                          c->tag = tag;
-                    if(screen != -1)
+                    if(screen != -1 && screen <= screen_count() - 1)
                          c->screen = screen;
 
                     client_update_attributes(c);