]> git.sesse.net Git - vlc/blobdiff - modules/gui/wxwidgets/dialogs.cpp
Remove useless test before free and delete.
[vlc] / modules / gui / wxwidgets / dialogs.cpp
index 2701e7932c38150783ce2dcae10e598fdbe8d57c..3b58e794ebda64f37a2dd5a24a210871e949b589 100644 (file)
@@ -264,22 +264,22 @@ DialogsProvider::~DialogsProvider()
     PopEventHandler(true);
 
     /* Clean up */
-    if( p_open_dialog )     delete p_open_dialog;
+    delete p_open_dialog;
     if( p_prefs_dialog )    p_prefs_dialog->Destroy();
-    if( p_file_dialog )     delete p_file_dialog;
-    if( p_playlist_dialog ) delete p_playlist_dialog;
-    if( p_messages_dialog ) delete p_messages_dialog;
-    if( p_fileinfo_dialog ) delete p_fileinfo_dialog;
-    if( p_file_generic_dialog ) delete p_file_generic_dialog;
-    if( p_wizard_dialog ) delete p_wizard_dialog;
-    if( p_bookmarks_dialog ) delete p_bookmarks_dialog;
+    delete p_file_dialog;
+    delete p_playlist_dialog;
+    delete p_messages_dialog;
+    delete p_fileinfo_dialog;
+    delete p_file_generic_dialog;
+    delete p_wizard_dialog;
+    delete p_bookmarks_dialog;
 #ifdef UPDATE_CHECK
-    if( p_updatevlc_dialog ) delete p_updatevlc_dialog;
+    delete p_updatevlc_dialog;
 #endif
-    //if( p_vlm_dialog ) delete p_vlm_dialog;
+    //delete p_vlm_dialog;
 
 
-    if( p_intf->p_sys->p_icon ) delete p_intf->p_sys->p_icon;
+    delete p_intf->p_sys->p_icon;
 
     /* We must set this here because on win32 this destructor will be
      * automatically called so we must not call it again on wxApp->OnExit().
@@ -427,8 +427,8 @@ void DialogsProvider::OnOpenFileGeneric( wxCommandEvent& event )
         }
         free( p_arg->psz_results );
     }
-    if( p_arg->psz_title ) free( p_arg->psz_title );
-    if( p_arg->psz_extensions ) free( p_arg->psz_extensions );
+    free( p_arg->psz_title );
+    free( p_arg->psz_extensions );
 
     free( p_arg );
 }