From: Gildas Bazin <gbazin@videolan.org>
Date: Sat, 3 Sep 2005 22:55:56 +0000 (+0000)
Subject: * modules/gui/wxwidgets/playlist.cpp: Fixed segfault. Patch by Brian Robb (vascy... 
X-Git-Tag: 0.8.4~581
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=37a65fa65e9e5f16f38a964d5696efde91f479f8;p=vlc

* modules/gui/wxwidgets/playlist.cpp: Fixed segfault. Patch by Brian Robb (vascy at hotmail).
---

diff --git a/modules/gui/wxwidgets/playlist.cpp b/modules/gui/wxwidgets/playlist.cpp
index f5c5b1de4d..739a9a3899 100644
--- a/modules/gui/wxwidgets/playlist.cpp
+++ b/modules/gui/wxwidgets/playlist.cpp
@@ -200,15 +200,13 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
 
     /* Initializations */
     p_intf = _p_intf;
+    pp_sds = NULL;
     i_update_counter = 0;
     i_sort_mode = MODE_NONE;
     b_need_update = VLC_FALSE;
     p_playlist = (playlist_t *)vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
                                                 FIND_ANYWHERE );
-    if( p_playlist == NULL )
-    {
-        return;
-    }
+    if( p_playlist == NULL ) return;
 
     SetIcon( *p_intf->p_sys->p_icon );
 
@@ -395,13 +393,9 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
 
 Playlist::~Playlist()
 {
-    if( pp_sds != NULL )
-        free( pp_sds );
+    if( pp_sds != NULL ) free( pp_sds );
 
-    if( p_playlist == NULL )
-    {
-        return;
-    }
+    if( p_playlist == NULL ) return;
 
     var_DelCallback( p_playlist, "item-change", ItemChanged, this );
     var_DelCallback( p_playlist, "playlist-current", PlaylistNext, this );