Qt4 - and fix the previous [22886]

diff --git a/modules/gui/qt4/components/simple_preferences.cpp b/modules/gui/qt4/components/simple_preferences.cpp
index 103072d7c63f34e6f4dbe7e07770cfd7f7e037ec..210d249aaa5796675ea5f083fc42067fe32c225d 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.cpp
+++ b/modules/gui/qt4/components/simple_preferences.cpp
@@ -267,6 +267,7 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
 
         /* Input and Codecs Panel Implementation */
         START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") );
+            inputDevice = ui.DVDDevice;
           /* Disk Devices */
             {
                 ui.DVDDevice->setToolTip( qtr( "If this propriety is blank, then you have\n"
@@ -401,7 +402,7 @@ void SPrefsPanel::apply()
     }
     /* Devices */
     //FIXME is it qta or qtu ????
-    char *psz_devicepath = qtu( ui.DVDDevice->Text() );
+    char *psz_devicepath = qtu( inputDevice->text() );
     if( !EMPTY_STR( psz_devicepath ) )
     {
         config_PutPsz( p_intf, "dvd", psz_devicepath );

diff --git a/modules/gui/qt4/components/simple_preferences.hpp b/modules/gui/qt4/components/simple_preferences.hpp
index 08a8b1f6263dd2b0ae6c81fce8ae680dc614b374..affc333b3dc7061e653a94d1f52242789aabf47a 100644 (file)
--- a/modules/gui/qt4/components/simple_preferences.hpp
+++ b/modules/gui/qt4/components/simple_preferences.hpp
@@ -41,6 +41,8 @@ enum {
 
 class ConfigControl;
 class QComboBox;
+class QLineEdit;
+
 class SPrefsCatList : public QWidget
 {
     Q_OBJECT;
@@ -72,6 +74,7 @@ private:
     QWidget *directx_options;
     QWidget *file_options;
     QComboBox *audioOutput;
+    QLineEdit *inputDevice;
 
 /* Display only the options for the selected audio output */
 private slots: