3 files changed, 31 insertions, 15 deletions

diff --git a/include/mingw.h b/include/mingw.h
index 97db2f6a9..6e851b43d 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -609,7 +609,6 @@ ULONGLONG CompatGetTickCount64(void);
 
 ssize_t get_random_bytes(void *buf, ssize_t count);
 int enumerate_links(const char *file, char *name);
-void hide_console(int);
 
 int unc_root_len(const char *dir);
 int root_len(const char *path);
diff --git a/shell/ash.c b/shell/ash.c
index 41bf45734..2ea87a049 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -252,6 +252,7 @@
 #endif
 #if ENABLE_PLATFORM_MINGW32
 # include <conio.h>
+# include "lazyload.h"
 #endif
 
 /* So far, all bash compat is controlled by one config option */
@@ -2994,6 +2995,33 @@ setwinxp(int on)
                 }
         }
 }
+
+# if ENABLE_ASH_NOCONSOLE
+/*
+ * Console state is either:
+ *  0 normal
+ *  1 iconified
+ *  2 unknown
+ */
+static int console_state(void)
+{
+        DECLARE_PROC_ADDR(BOOL, ShowWindow, HWND, int);
+        DECLARE_PROC_ADDR(BOOL, IsIconic, HWND);
+
+        if (INIT_PROC_ADDR(user32.dll, ShowWindow) &&
+                        INIT_PROC_ADDR(user32.dll, IsIconic)) {
+                return IsIconic(GetConsoleWindow()) != 0;
+        }
+        return 2;
+}
+
+static void hide_console(int hide)
+{
+        // Switch console state if it's known and isn't the required state
+        if (console_state() == !hide)
+                ShowWindow(GetConsoleWindow(), hide ? SW_MINIMIZE : SW_NORMAL);
+}
+# endif
 #endif
 
 
@@ -12616,6 +12644,9 @@ options(int *login_sh)
 #if ENABLE_PLATFORM_MINGW32
                 dirarg = NULL;
                 title = NULL;
+# if ENABLE_ASH_NOCONSOLE
+                noconsole = console_state();
+# endif
 # if ENABLE_SUW32
                 delayexit = 0;
 # endif
diff --git a/win32/mingw.c b/win32/mingw.c
index dabb2a2e7..fec6df73a 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -2219,20 +2219,6 @@ int enumerate_links(const char *file, char *name)
 }
 #endif
 
-#if ENABLE_ASH_NOCONSOLE
-void hide_console(int hide)
-{
-        DECLARE_PROC_ADDR(BOOL, ShowWindow, HWND, int);
-        DECLARE_PROC_ADDR(BOOL, IsIconic, HWND);
-
-        if (INIT_PROC_ADDR(user32.dll, ShowWindow) &&
-                        INIT_PROC_ADDR(user32.dll, IsIconic)) {
-                if (IsIconic(GetConsoleWindow()) == !hide)
-                        ShowWindow(GetConsoleWindow(), hide ? SW_MINIMIZE : SW_NORMAL);
-        }
-}
-#endif
-
 /* Return the length of the root of a UNC path, i.e. the '//host/share'
  * component, or 0 if the path doesn't look like that. */
 int unc_root_len(const char *dir)