Commit 54c23b66 authored by Rémi Duraffort's avatar Rémi Duraffort

Remove useless test before a delete.

parent 10b3d6f1
...@@ -530,7 +530,7 @@ describe: ...@@ -530,7 +530,7 @@ describe:
psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd, psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
&authenticator ); &authenticator );
if( psz_options ) delete [] psz_options; delete [] psz_options;
p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator, p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator,
var_GetBool( p_demux, "rtsp-kasenna" ) ); var_GetBool( p_demux, "rtsp-kasenna" ) );
......
...@@ -777,20 +777,20 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode) ...@@ -777,20 +777,20 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode)
{ {
msg_Dbg( p_vout, "using single-buffered overlay" ); msg_Dbg( p_vout, "using single-buffered overlay" );
bitmap_count = 2; bitmap_count = 2;
if( bitmap[2] ) { delete bitmap[2]; bitmap[2] = NULL; } delete bitmap[2]; bitmap[2] = NULL;
} }
} }
else else
{ {
msg_Dbg( p_vout, "using simple overlay" ); msg_Dbg( p_vout, "using simple overlay" );
bitmap_count = 1; bitmap_count = 1;
if( bitmap[1] ) { delete bitmap[1]; bitmap[1] = NULL; } delete bitmap[1]; bitmap[1] = NULL;
} }
break; break;
} }
else else
{ {
if( bitmap[0] ) { delete bitmap[0]; bitmap[0] = NULL; } delete bitmap[0]; bitmap[0] = NULL;
} }
} }
...@@ -829,9 +829,9 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode) ...@@ -829,9 +829,9 @@ VideoWindow::_AllocateBuffers(int width, int height, int* mode)
void void
VideoWindow::_FreeBuffers() VideoWindow::_FreeBuffers()
{ {
if( bitmap[0] ) { delete bitmap[0]; bitmap[0] = NULL; } delete bitmap[0]; bitmap[0] = NULL;
if( bitmap[1] ) { delete bitmap[1]; bitmap[1] = NULL; } delete bitmap[1]; bitmap[1] = NULL;
if( bitmap[2] ) { delete bitmap[2]; bitmap[2] = NULL; } delete bitmap[2]; bitmap[2] = NULL;
fInitStatus = B_ERROR; fInitStatus = B_ERROR;
} }
......
...@@ -197,8 +197,8 @@ void InteractionDialog::update() ...@@ -197,8 +197,8 @@ void InteractionDialog::update()
InteractionDialog::~InteractionDialog() InteractionDialog::~InteractionDialog()
{ {
// if( panel ) delete panel; // delete panel;
if( dialog ) delete dialog; delete dialog;
} }
void InteractionDialog::defaultB() void InteractionDialog::defaultB()
......
...@@ -384,7 +384,7 @@ static void Init( intf_thread_t *p_intf ) ...@@ -384,7 +384,7 @@ static void Init( intf_thread_t *p_intf )
/* Destroy first the main interface because it is connected to some slots /* Destroy first the main interface because it is connected to some slots
in the MainInputManager */ 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 /* Destroy then other windows, because some are connected to some slots
in the MainInputManager */ in the MainInputManager */
......
...@@ -116,8 +116,8 @@ Interface::Interface( intf_thread_t *p_intf, CBaseWindow *p_parent, ...@@ -116,8 +116,8 @@ Interface::Interface( intf_thread_t *p_intf, CBaseWindow *p_parent,
Interface::~Interface() Interface::~Interface()
{ {
if( timer ) delete timer; delete timer;
if( video ) delete video; delete video;
} }
BOOL Interface::InitInstance() BOOL Interface::InitInstance()
......
...@@ -273,7 +273,7 @@ static void MainLoop( intf_thread_t *p_intf ) ...@@ -273,7 +273,7 @@ static void MainLoop( intf_thread_t *p_intf )
} }
end: end:
if( intf ) delete intf; delete intf;
#ifndef UNDER_CE #ifndef UNDER_CE
/* Uninitialize OLE/COM */ /* Uninitialize OLE/COM */
......
...@@ -102,8 +102,7 @@ Messages::Messages( intf_thread_t *_p_intf, wxWindow *p_parent ): ...@@ -102,8 +102,7 @@ Messages::Messages( intf_thread_t *_p_intf, wxWindow *p_parent ):
Messages::~Messages() Messages::~Messages()
{ {
/* Clean up */ /* Clean up */
if( save_log_dialog ) delete save_log_dialog; delete save_log_dialog;
delete info_attr; delete info_attr;
delete err_attr; delete err_attr;
delete warn_attr; delete warn_attr;
......
...@@ -512,19 +512,19 @@ Interface::~Interface() ...@@ -512,19 +512,19 @@ Interface::~Interface()
PopEventHandler(true); PopEventHandler(true);
if( video_window ) delete video_window; delete video_window;
/* wxCocoa pretends to support this, but at least 2.6.x doesn't */ /* wxCocoa pretends to support this, but at least 2.6.x doesn't */
#ifndef __APPLE__ #ifndef __APPLE__
#ifdef wxHAS_TASK_BAR_ICON #ifdef wxHAS_TASK_BAR_ICON
if( p_systray ) delete p_systray; delete p_systray;
#endif #endif
#endif #endif
p_intf->b_interaction = VLC_FALSE; p_intf->b_interaction = VLC_FALSE;
var_DelCallback( p_intf, "interaction", InteractCallback, this ); var_DelCallback( p_intf, "interaction", InteractCallback, this );
if( p_intf->p_sys->p_wxwindow ) delete p_intf->p_sys->p_wxwindow; delete p_intf->p_sys->p_wxwindow;
/* Clean up */ /* Clean up */
......
...@@ -418,7 +418,7 @@ int Instance::OnExit() ...@@ -418,7 +418,7 @@ int Instance::OnExit()
if( p_intf->pf_show_dialog ) if( p_intf->pf_show_dialog )
{ {
/* We need to manually clean up the dialogs class */ /* We need to manually clean up the dialogs class */
if( p_intf->p_sys->p_wxwindow ) delete p_intf->p_sys->p_wxwindow; delete p_intf->p_sys->p_wxwindow;
} }
#if (wxCHECK_VERSION(2,5,0)) #if (wxCHECK_VERSION(2,5,0))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment