changeset 35002:64d72a128ea8

Rewrite condition and use console_state instead of console. Although - currently - both variables are the same, it's console_state which reflects the current state of the debug console.
author ib
date Wed, 15 Aug 2012 17:46:38 +0000
parents 05d54ab2ba5c
children 1ef3902e9cc4
files gui/win32/gui.c
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/gui/win32/gui.c	Wed Aug 15 17:22:01 2012 +0000
+++ b/gui/win32/gui.c	Wed Aug 15 17:46:38 2012 +0000
@@ -157,10 +157,12 @@
         print_version("MPlayer");
         console_state = 1;
     }
-    if (gui == NULL)
-        return;
-    CheckMenuItem(gui->traymenu, ID_CONSOLE, MF_BYCOMMAND | (console ? MF_CHECKED : MF_UNCHECKED));
-    CheckMenuItem(gui->menu, ID_CONSOLE, MF_BYCOMMAND | (console ? MF_CHECKED : MF_UNCHECKED));
+
+    if (gui)
+    {
+        CheckMenuItem(gui->traymenu, ID_CONSOLE, MF_BYCOMMAND | (console_state ? MF_CHECKED : MF_UNCHECKED));
+        CheckMenuItem(gui->menu, ID_CONSOLE, MF_BYCOMMAND | (console_state ? MF_CHECKED : MF_UNCHECKED));
+    }
 }
 
 void capitalize(char *filename)