[vlc-commits] dialog: prevent updates if canceled

Francois Cartegnie git at videolan.org
Tue May 3 18:45:42 CEST 2016


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon May  2 10:52:01 2016 +0200| [a3fb6b5867f48716470a0b9f248d80e412d3e7c5] | committer: Francois Cartegnie

dialog: prevent updates if canceled

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a3fb6b5867f48716470a0b9f248d80e412d3e7c5
---

 src/interface/dialog.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/interface/dialog.c b/src/interface/dialog.c
index 7e3e390..c21939c 100644
--- a/src/interface/dialog.c
+++ b/src/interface/dialog.c
@@ -647,7 +647,8 @@ dialog_update_progress(vlc_object_t *p_obj, vlc_dialog_id *p_id, float f_value,
     vlc_dialog_provider *p_provider = get_dialog_provider(p_obj, false);
 
     vlc_mutex_lock(&p_provider->lock);
-    if (p_provider->cbs.pf_update_progress == NULL)
+    if (p_provider->cbs.pf_update_progress == NULL ||
+        vlc_dialog_is_cancelled(p_obj, p_id))
     {
         vlc_mutex_unlock(&p_provider->lock);
         free(psz_text);



More information about the vlc-commits mailing list