From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 4 Jul 2009 21:43:00 +0000 (+0300)
Subject: Separate variable for modal and non modal errors
X-Git-Tag: 1.1.0-ff~5129
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=afacc88aab72550887cbe868e7d7f17b1d3baabd;p=vlc

Separate variable for modal and non modal errors
---

diff --git a/include/vlc_dialog.h b/include/vlc_dialog.h
index 0270cb8baa..4b99ce766b 100644
--- a/include/vlc_dialog.h
+++ b/include/vlc_dialog.h
@@ -35,7 +35,6 @@ typedef struct dialog_fatal_t
 {
     const char *title;
     const char *message;
-    bool modal;
 } dialog_fatal_t;
 
 VLC_EXPORT( void, dialog_VFatal, (vlc_object_t *, bool, const char *, const char *, va_list) );
diff --git a/src/interface/dialog.c b/src/interface/dialog.c
index 22ac7859e7..50500405ad 100644
--- a/src/interface/dialog.c
+++ b/src/interface/dialog.c
@@ -119,8 +119,9 @@ void dialog_VFatal (vlc_object_t *obj, bool modal, const char *title,
 
     if (vasprintf (&text, fmt, ap) != -1)
     {
-        dialog_fatal_t dialog = { title, text, modal, };
-        var_SetAddress (provider, "dialog-fatal", &dialog);
+        dialog_fatal_t dialog = { title, text, };
+        var_SetAddress (provider,
+                        modal ? "dialog-critical" : "dialog-error", &dialog);
         free (text);
     }
     vlc_object_release (provider);