From afcbe063633698faa9afed65afda3465df177206 Mon Sep 17 00:00:00 2001
From: kojima <kojima>
Date: Sat, 17 Apr 1999 19:44:58 +0000
Subject: [PATCH] *** empty log message ***

---
 src/actions.c  | 3 ++-
 src/event.c    | 2 +-
 src/kwm.c      | 5 +++--
 src/rootmenu.c | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/actions.c b/src/actions.c
index d24216c7..9f4f7e8f 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -1779,7 +1779,8 @@ wSelectWindow(WWindow *wwin, Bool flag)
 void
 wMakeWindowVisible(WWindow *wwin)
 {
-    wWorkspaceChange(wwin->screen_ptr, wwin->frame->workspace);
+    if (wwin->frame->workspace != wwin->screen_ptr->current_workspace)
+	wWorkspaceChange(wwin->screen_ptr, wwin->frame->workspace);
 
     if (wwin->flags.shaded) {
 	wUnshadeWindow(wwin);
diff --git a/src/event.c b/src/event.c
index 5eea11ea..e4a4f36b 100644
--- a/src/event.c
+++ b/src/event.c
@@ -220,7 +220,7 @@ DispatchEvent(XEvent *event)
 
 	Shutdown(WSRestartPreparationMode);
 	/* received SIGHUP */
-	Restart(NULL);
+	Restart(NULL, True);
     }
 
     /* for the case that all that is wanted to be dispatched is
diff --git a/src/kwm.c b/src/kwm.c
index 58433ecd..374970f2 100644
--- a/src/kwm.c
+++ b/src/kwm.c
@@ -1068,7 +1068,8 @@ performCommand(WScreen *scr, char *command, XClientMessageEvent *event)
     } else if (strncmp(command, "go:", 3)==0) {
 
 	Shutdown(WSRestartPreparationMode);
-	Restart(&command[3]);
+	Restart(&command[3], False);
+	Restart(NULL, True);
 
     } else if (strcmp(command, "desktop+1")==0) {
 
@@ -1122,7 +1123,7 @@ performCommand(WScreen *scr, char *command, XClientMessageEvent *event)
     } else if (strcmp(command, "wmaker:restart")==0) {
 
 	Shutdown(WSRestartPreparationMode);
-	Restart(NULL);
+	Restart(NULL, True);
 
     } else if (strcmp(command, "wmaker:exit")==0) {
 
diff --git a/src/rootmenu.c b/src/rootmenu.c
index 86a1feb4..8fd8c21d 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -265,7 +265,8 @@ static void
 restartCommand(WMenu *menu, WMenuEntry *entry)
 {
     Shutdown(WSRestartPreparationMode);
-    Restart((char*)entry->clientdata);
+    Restart((char*)entry->clientdata, False);
+    Restart(NULL, True);
 }