Remove useless test before a delete.

[vlc] / modules / gui / qt4 / qt4.cpp

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 0bea6f491f5c9f3e68c264be839aa05c461cf475..ccfd614167de201df1f9c610f6c4e4f11ff540e4 100644 (file)
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -31,7 +31,6 @@
 #include <QDate>
 
 #include "qt4.hpp"
-#include <vlc_os_specific.h>
 #include "dialogs_provider.hpp"
 #include "input_manager.hpp"
 #include "main_interface.hpp"
@@ -295,7 +294,8 @@ static void Init( intf_thread_t *p_intf )
      * see commits 21610 21622 21654 for reference */
 
     /* If you don't have a gconftool-2 binary, you should comment this line */
-    QApplication::setDesktopSettingsAware( false );
+    if( strcmp( qVersion(), "4.4.0" ) < 0 ) /* fixed in Qt 4.4.0 */
+        QApplication::setDesktopSettingsAware( false );
 #endif
 
     /* Start the QApplication here */
@@ -334,7 +334,7 @@ static void Init( intf_thread_t *p_intf )
 #if !defined( WIN32 )
     QString path =  QString( QT4LOCALEDIR );
 #else
-    QString path = QString( QString(system_VLCPath()) + DIR_SEP +
+    QString path = QString( QString(config_GetDataDir()) + DIR_SEP +
                             "locale" + DIR_SEP );
 #endif
     // files depending on locale
@@ -347,7 +347,7 @@ static void Init( intf_thread_t *p_intf )
     /* Start playing if needed */
     if( !p_intf->pf_show_dialog && p_intf->b_play )
     {
-        playlist_Control( THEPL, PLAYLIST_AUTOPLAY, VLC_FALSE );
+        playlist_Control( THEPL, PLAYLIST_PLAY, VLC_FALSE );
     }
 
     /* Explain to the core how to show a dialog :D */
@@ -384,7 +384,7 @@ static void Init( intf_thread_t *p_intf )
 
     /* Destroy first the main interface because it is connected to some slots
        in the MainInputManager */
-    if( p_intf->p_sys->p_mi ) delete p_intf->p_sys->p_mi;
+    delete p_intf->p_sys->p_mi;
 
     /* Destroy then other windows, because some are connected to some slots
        in the MainInputManager */