]> git.sesse.net Git - vlc/commitdiff
Fix no
authorClément Stenac <zorglub@videolan.org>
Wed, 14 Dec 2005 19:10:46 +0000 (19:10 +0000)
committerClément Stenac <zorglub@videolan.org>
Wed, 14 Dec 2005 19:10:46 +0000 (19:10 +0000)
modules/gui/wxwidgets/dialogs/interaction.cpp
src/interface/interaction.c

index 45aad02cc669597369417e0a7eb95cea33c9058f..b2b6acd7d2b96d48288d7679b3c3996d106b05de 100644 (file)
@@ -46,7 +46,7 @@ BEGIN_EVENT_TABLE( InteractionDialog, wxFrame )
     EVT_BUTTON( wxID_OK, InteractionDialog::OnOkYes )
     EVT_BUTTON( wxID_YES, InteractionDialog::OnOkYes )
     EVT_BUTTON( wxID_CANCEL, InteractionDialog::OnCancel)
-    EVT_BUTTON( No_Event, InteractionDialog::OnNo )
+    EVT_BUTTON( wxID_NO, InteractionDialog::OnNo )
     EVT_BUTTON( wxID_CLEAR, InteractionDialog::OnClear )
     EVT_CHECKBOX( NoShow_Event, InteractionDialog::OnNoShow )
 END_EVENT_TABLE()
index b08ad7677525fc2b7513dfe40b207811c88e9a02..07c56397881a83c5e4c0e83fa4b9261d8c6b3cea 100644 (file)
@@ -376,7 +376,11 @@ void __intf_UserProgressUpdate( vlc_object_t *p_this, int i_id,
     vlc_mutex_lock( &p_interaction->object_lock );
     p_dialog  =  intf_InteractionGetById( p_this, i_id );
 
-    if( !p_dialog ) return;
+    if( !p_dialog )
+    {
+        vlc_mutex_unlock( &p_intearction->object_lock ) ;
+        return;
+    }
 
     if( p_dialog->pp_widgets[0]->psz_text )
         free( p_dialog->pp_widgets[0]->psz_text );