From 59e174e888c35abf854545ddba2a92fecea2ace3 Mon Sep 17 00:00:00 2001 From: Martin Fuchs Date: Sat, 27 Dec 2003 12:29:42 +0000 Subject: [PATCH] Don't display cabinet window in desktop mode as default svn path=/trunk/; revision=7262 --- reactos/subsys/system/explorer/explorer.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/reactos/subsys/system/explorer/explorer.cpp b/reactos/subsys/system/explorer/explorer.cpp index da8d27080ec..7c0ae3c2659 100644 --- a/reactos/subsys/system/explorer/explorer.cpp +++ b/reactos/subsys/system/explorer/explorer.cpp @@ -236,14 +236,12 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL // If there is given the command line option "-desktop", create desktop window anyways if (_tcsstr(lpCmdLine,TEXT("-desktop"))) startup_desktop = TRUE; - - if (_tcsstr(lpCmdLine,TEXT("-nodesktop"))) + else if (_tcsstr(lpCmdLine,TEXT("-nodesktop"))) startup_desktop = FALSE; - if (_tcsstr(lpCmdLine,TEXT("-noexplorer"))) { + // Don't display cabinet window in desktop mode + if (startup_desktop && !_tcsstr(lpCmdLine,TEXT("-explorer"))) nShowCmd = SW_HIDE; - startup_desktop = TRUE; - } if (_tcsstr(lpCmdLine,TEXT("-noautostart"))) autostart = false;