Better fix

diff --git a/modules/gui/wxwidgets/dialogs.cpp b/modules/gui/wxwidgets/dialogs.cpp
index b4da350b5dbe607fa87346611eb226edf6e8fdc4..a28af2189f8e77c98abc0b827e820f3963a0caca 100644 (file)
--- a/modules/gui/wxwidgets/dialogs.cpp
+++ b/modules/gui/wxwidgets/dialogs.cpp
@@ -564,11 +564,13 @@ void DialogsProvider::OnInteraction( wxCommandEvent& event )
         break;
     case INTERACT_UPDATE:
         p_wxdialog = (InteractionDialog*)(p_dialog->p_private);
-        p_wxdialog->Update();
+        if( p_wxdialog)
+            p_wxdialog->Update();
         break;
     case INTERACT_HIDE:
         p_wxdialog = (InteractionDialog*)(p_dialog->p_private);
-        p_wxdialog->Hide();
+        if( p_wxdialog )
+            p_wxdialog->Hide();
         p_dialog->i_status = HIDDEN_DIALOG;
         break;
     case INTERACT_DESTROY:

diff --git a/modules/services_discovery/shout.c b/modules/services_discovery/shout.c
index 3229aadc94498d01afac86320fcfbfc52588d536..0cf5088d3dc32379f2311ab04b42c1b2c37c9d2a 100644 (file)
--- a/modules/services_discovery/shout.c
+++ b/modules/services_discovery/shout.c
@@ -203,7 +203,7 @@ static void Run( services_discovery_t *p_sd )
             int i_state = var_GetInteger( p_input, "state" );
             if( i_state == PLAYING_S )
             {
-                float f_pos = (float)(p_sys->p_item->i_children)* 100.0 /
+                float f_pos = (float)(p_sys->p_item->i_children)* 2 *100.0 /
                               (float)(p_sys->i_limit);
                 intf_UserProgressUpdate( p_sd, i_dialog_id, "Downloading",
                                          f_pos );
@@ -215,6 +215,6 @@ static void Run( services_discovery_t *p_sd )
             p_sys->b_dialog  = VLC_FALSE;
             intf_UserHide( p_sd, i_dialog_id );
         }
-        msleep( 100000 );
+        msleep( 10000 );
     }
 }

diff --git a/src/interface/interaction.c b/src/interface/interaction.c
index f16fc1d4e3f4244243b4043046ae7602e3601073..4e12a77821cc1ce15c00cdf5fb941a47efb561e3 100644 (file)
--- a/src/interface/interaction.c
+++ b/src/interface/interaction.c
@@ -228,6 +228,7 @@ void intf_InteractionManage( playlist_t *p_playlist )
         new->pp_widgets = NULL;                                         \
         new->psz_title = NULL;                                          \
         new->psz_description = NULL;                                    \
+        new->p_private = NULL;                                          \
         new->i_id = 0;                                                  \
         new->i_flags = 0;                                               \
         new->i_status = NEW_DIALOG;
@@ -375,8 +376,7 @@ 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 || p_dialog->i_status == NEW_DIALOG
-                  || p_dialog->i_status == HIDING_DIALOG )
+    if( !p_dialog )
     {
         vlc_mutex_unlock( &p_interaction->object_lock ) ;
         return;
@@ -466,8 +466,7 @@ void __intf_UserHide( 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 || p_dialog->i_status == NEW_DIALOG
-                  || p_dialog->i_status == HIDING_DIALOG )
+    if( !p_dialog )
     {
        vlc_mutex_unlock( &p_interaction->object_lock );
        return;