[vlc-devel] commit: Fix grammar and don't minimize if config_getInt fails ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Jan 10 15:53:34 2009 +0200| [67e84bad5918e10e23a50f184c2a8fc220d400f8] | committer: Rémi Denis-Courmont 

Fix grammar and don't minimize if config_getInt fails

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=67e84bad5918e10e23a50f184c2a8fc220d400f8
---

 modules/gui/qt4/main_interface.cpp |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 9aeb1f4..056d5fc 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -308,22 +308,21 @@ inline void MainInterface::createStatusBar()
 
 inline void MainInterface::initSystray()
 {
-    bool b_createSystray = false;
     bool b_systrayAvailable = QSystemTrayIcon::isSystemTrayAvailable();
-    if( config_GetInt( p_intf, "qt-start-minimized") )
+    bool b_systrayWanted = config_GetInt( p_intf, "qt-system-tray" );
+
+    if( config_GetInt( p_intf, "qt-start-minimized") > 0 )
     {
         if( b_systrayAvailable )
         {
-            b_createSystray = true;
+            b_systrayWanted = true;
             hide();
         }
-        else msg_Err( p_intf, "You can't minimize if you haven't a system "
-                "tray bar" );
+        else
+            msg_Err( p_intf, "cannot start minimized without system tray bar" );
     }
-    if( config_GetInt( p_intf, "qt-system-tray") )
-        b_createSystray = true;
 
-    if( b_systrayAvailable && b_createSystray )
+    if( b_systrayAvailable && b_systrayWanted )
             createSystray();
 }