[vlc-commits] qt: fix assert when cdda module is not present

Thomas Guillem git at videolan.org
Wed Mar 27 08:53:14 CET 2019


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Mar 27 08:52:29 2019 +0100| [1ca47608dddab5e030ad7f9d6cb853f499127de4] | committer: Thomas Guillem

qt: fix assert when cdda module is not present

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

 modules/gui/qt/components/open_panels.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/gui/qt/components/open_panels.cpp b/modules/gui/qt/components/open_panels.cpp
index b9208cd58f..b92ec91242 100644
--- a/modules/gui/qt/components/open_panels.cpp
+++ b/modules/gui/qt/components/open_panels.cpp
@@ -330,7 +330,8 @@ DiscOpenPanel::DiscOpenPanel( QWidget *_parent, intf_thread_t *_p_intf ) :
     /* Get the default configuration path for the devices */
     psz_dvddiscpath = var_InheritString( p_intf, "dvd" );
     psz_vcddiscpath = var_InheritString( p_intf, "vcd" );
-    psz_cddadiscpath = var_InheritString( p_intf, "cd-audio" );
+    psz_cddadiscpath = config_GetType("cd-audio") ?
+                       var_InheritString( p_intf, "cd-audio" ) : NULL;
 
     /* State to avoid overwritting the users changes with the configuration */
     m_discType = None;



More information about the vlc-commits mailing list