vlc | branch: master | Adrian Yanes <[email protected]> | Thu Feb 23 15:19:07 
2012 +0100| [3feeb95479ff7b760ecf90869e001d52a53d784d] | committer: 
Jean-Baptiste Kempf

Qt: fix macro RADIO_OR_COMMAND

Commit d858c4 introduces a new macro that is chosen to evaluate if an
element in submenus should be an ITEM_NORMAL or ITEM_RADIO
based on VLC_VAR_ISCOMMAND flag. The conditional results were in
the wrong order.

Close: #6149 #6197

Signed-off-by: Jean-Baptiste Kempf <[email protected]>

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

 modules/gui/qt4/menus.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index f9b97b1..520aafb 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -1396,7 +1396,7 @@ int VLCMenuBar::CreateChoicesMenu( QMenu *submenu, const 
char *psz_var,
 
 #define CURVAL val_list.p_list->p_values[i]
 #define CURTEXT text_list.p_list->p_values[i].psz_string
-#define RADIO_OR_COMMAND  ( i_type & VLC_VAR_ISCOMMAND ) ? ITEM_NORMAL : 
ITEM_RADIO
+#define RADIO_OR_COMMAND  ( i_type & VLC_VAR_ISCOMMAND ) ? ITEM_RADIO : 
ITEM_NORMAL
 
     for( i = 0; i < val_list.p_list->i_count; i++ )
     {

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to