1 files changed, 3 insertions, 10 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 15c0e56a3..4b063217a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2981,17 +2981,10 @@ static int console_state(void)
         DECLARE_PROC_ADDR(BOOL, ShowWindow, HWND, int);
 
         if (INIT_PROC_ADDR(user32.dll, ShowWindow)) {
-                BOOL state;
+                BOOL visible = IsWindowVisible(GetConsoleWindow());
+                BOOL iconified = IsIconic(GetConsoleWindow());
 
-                if (noiconify) {
-                        state = IsWindowVisible(GetConsoleWindow());
-                        if (state >= 0)
-                                return state == 0;
-                } else {
-                        state = IsIconic(GetConsoleWindow());
-                        if (state >= 0)
-                                return state != 0;
-                }
+                return !visible || iconified;
         }
         return 2;
 }