[vlc-commits] Qt: fix a potential crash in audioDevice Menu

Jean-Baptiste Kempf git at videolan.org
Tue Aug 20 18:58:14 CEST 2013


vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Aug 20 18:56:50 2013 +0200| [ccd20286943787e8d77c8ce15e98135f4baf0c94] | committer: Jean-Baptiste Kempf

Qt: fix a potential crash in audioDevice Menu

Close #9222

(cherry picked from commit 357bcda71de0e903a9b73b91fca73508a01001e4)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt4/menus.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 17fd12a..2cb7617 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1550,7 +1550,7 @@ void VLCMenuBar::updateAudioDevice( intf_thread_t * p_intf, audio_output_t *p_ao
     char **ids, **names;
     char *selected;
 
-    if( !p_aout )
+    if( !p_aout || !current )
         return;
 
     current->clear();



More information about the vlc-commits mailing list