[vlc-commits] Qt4: fix compressor and spatializer initializer order (fixes #7296)

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug 20 15:21:07 2012 +0300| [d9f701924d900821cd77c0575a2b77dd5c2d788c] | committer: Rémi Denis-Courmont

Qt4: fix compressor and spatializer initializer order (fixes #7296)

(cherry picked from commit accf189a2554fb52e4a362be55124f13f510fdfb)

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

 modules/gui/qt4/components/extended_panels.cpp |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp
index 2a00613..04b1f90 100644
--- a/modules/gui/qt4/components/extended_panels.cpp
+++ b/modules/gui/qt4/components/extended_panels.cpp
@@ -1226,8 +1226,6 @@ Compressor::Compressor( intf_thread_t *_p_intf, QWidget *_parent )
 
         oldControlVars[i] = comp_controls[i].f_value;
 
-        CONNECT( compCtrl[i], valueChanged( int ), this, setInitValues() );
-
         ctrl_texts[i] = new QLabel( qtr( comp_controls[i].psz_descs ) + "\n" );
         ctrl_texts[i]->setFont( smallFont );
         ctrl_texts[i]->setAlignment( Qt::AlignHCenter );
@@ -1241,6 +1239,9 @@ Compressor::Compressor( intf_thread_t *_p_intf, QWidget *_parent )
         layout->addWidget( ctrl_texts[i],   3, i, Qt::AlignHCenter );
     }
 
+    for( int i = 0; i < NUM_CP_CTRL; i++ )
+        CONNECT( compCtrl[i], valueChanged( int ), this, setInitValues() );
+
     BUTTONACT( enableCheck, enable() );
 
     /* Write down initial values */
@@ -1370,8 +1371,6 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent )
         spatCtrl[i]->setValue( (int)var_InheritFloat( p_intf, spat_controls[i].psz_name ) * 10. );
         oldControlVars[i] = spatCtrl[i]->value();
 
-        CONNECT( spatCtrl[i], valueChanged( int ), this, setInitValues() );
-
         ctrl_texts[i] = new QLabel( qtr( spat_controls[i].psz_desc ) + "\n" );
         ctrl_texts[i]->setFont( smallFont );
 
@@ -1385,6 +1384,9 @@ Spatializer::Spatializer( intf_thread_t *_p_intf, QWidget *_parent )
     }
     spatCtrl[0]->setRange( 0, 11 );
 
+    for( int i = 0; i < NUM_SP_CTRL; i++ )
+        CONNECT( spatCtrl[i], valueChanged( int ), this, setInitValues() );
+
     BUTTONACT( enableCheck, enable() );
 
     /* Write down initial values */