[vlc-devel] commit: Fix displaying of teletext buttons. (Jean-Paul Saman )

[git version control]

vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Sat Jul 19 17:52:52 2008 +0200| [0b0379db5da23370333a5d503747b0733027de30]

Fix displaying of teletext buttons.

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

 modules/gui/qt4/components/interface_widgets.cpp |    1 +
 modules/gui/qt4/input_manager.cpp                |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 6a8f8ac..0cd05e6 100644
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -684,6 +684,7 @@ void ControlsWidget::toggleTeletext()
         b_telexEnabled = true;
     }
 }
+
 void ControlsWidget::enableTeletext( bool b_enable )
 {
     telexFrame->setVisible( b_enable );
diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp
index ab6a3a2..880f8ce 100644
--- a/modules/gui/qt4/input_manager.cpp
+++ b/modules/gui/qt4/input_manager.cpp
@@ -443,17 +443,17 @@ void InputManager::telexGotoPage( int page )
 
 void InputManager::telexToggle( bool b_enabled )
 {
-    int i_page = 100;
-
     if( hasInput() )
     {
         const int i_teletext_es = var_GetInteger( p_input, "teletext-es" );
         const int i_spu_es = var_GetInteger( p_input, "spu-es" );
 
-        b_enabled = i_teletext_es >= 0;
-        if( b_enabled && i_teletext_es == i_spu_es )
+        b_enabled = (i_teletext_es >= 0);
+        emit teletextEnabled( b_enabled );
+        if( b_enabled && (i_teletext_es == i_spu_es) )
         {
             vlc_object_t *p_vbi;
+            int i_page = 100;
             p_vbi = (vlc_object_t *) vlc_object_find_name( p_input,
                         "zvbi", FIND_ANYWHERE );
             if( p_vbi )
@@ -465,7 +465,7 @@ void InputManager::telexToggle( bool b_enabled )
             }
         }
     }
-    emit teletextEnabled( b_enabled );
+    else emit teletextEnabled( b_enabled );
 }
 
 void InputManager::telexToggleButtons()