[3/3] explorer: Don't close shell desktops automatically.

Vincent Povirk madewokherd at gmail.com
Fri Jan 24 15:13:54 CST 2014


-------------- next part --------------
From 04f299f005592f9c961fd00a885a7d89db6e15fa Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent at codeweavers.com>
Date: Fri, 24 Jan 2014 14:14:18 -0600
Subject: [PATCH 3/4] explorer: Don't close shell desktops automatically.

---
 programs/explorer/desktop.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c
index 4fa9351..4630b1e 100644
--- a/programs/explorer/desktop.c
+++ b/programs/explorer/desktop.c
@@ -64,6 +64,8 @@ static int desktop_width, launcher_size, launchers_per_row;
 static struct launcher **launchers;
 static unsigned int nb_launchers, nb_allocated;
 
+BOOL enable_shell;
+
 static RECT get_icon_rect( unsigned int index )
 {
     RECT rect;
@@ -527,7 +529,7 @@ static LRESULT WINAPI desktop_wnd_proc( HWND hwnd, UINT message, WPARAM wp, LPAR
         if (wp)
             /* Desktop was unlinked */
             PostQuitMessage(0);
-        else
+        else if (!enable_shell)
             /* Last process in this desktop quit */
             wine_unlink_desktop( GetThreadDesktop( GetCurrentThreadId() ) );
         return 0;
@@ -823,7 +825,6 @@ void manage_desktop( WCHAR *arg )
     WCHAR *cmdline = NULL, *driver = NULL;
     WCHAR *p = arg;
     const WCHAR *name = NULL;
-    BOOL enable_shell = FALSE;
 
     /* get the rest of the command line (if any) */
     while (*p && !isspace(*p)) p++;
-- 
1.8.1.2



More information about the wine-patches mailing list