From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Mon, 29 Oct 2007 02:00:53 +0000 (+0000)
Subject: Qt4 - and fix the previous [22886]
X-Git-Tag: 0.9.0-test0~4758
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=af967f850b2d6bcad19a933ff06eea2b15aa2754;p=vlc

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 103072d7c6..210d249aaa 100644
--- 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 08a8b1f626..affc333b3d 100644
--- 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: