[vlc-commits] dialog: disable dialog when interrupted

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Tue Oct 22 16:30:11 2019 +0200| [bf429d9e3add863a193a9e86f9b6f4f2650eaead] | committer: Thomas Guillem

dialog: disable dialog when interrupted

Interrupt was already handled in waiting dialog functions, but it was done
after showing the dialog and before waiting for an user interaction. This could
lead to dialog being showed and immediately cancelled.

This commit check for the killed state before any dialog interactions, this
also fixes non waiting dialog functions shown while being killed.

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

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

diff --git a/src/interface/dialog.c b/src/interface/dialog.c
index f18c6afc24..4205d88be4 100644
--- a/src/interface/dialog.c
+++ b/src/interface/dialog.c
@@ -122,7 +122,7 @@ struct dialog_i11e_context
 static inline vlc_dialog_provider *
 get_dialog_provider(vlc_object_t *p_obj, bool b_check_interact)
 {
-    if (b_check_interact && p_obj->no_interact)
+    if ((b_check_interact && p_obj->no_interact) || vlc_killed())
         return NULL;
 
     vlc_dialog_provider *p_provider =