Skip to content

V
vlc
Commit 527d3507 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: fix Windows open dialog issue on paste 

Close #6242
parent 0585f023
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
modules/gui/qt4/components/open_panels.cpp
View file @ 527d3507
...@@ -497,11 +497,12 @@ void DiscOpenPanel::updateMRL() ...@@ -497,11 +497,12 @@ void DiscOpenPanel::updateMRL()
QString discPath; QString discPath;
QStringList fileList; QStringList fileList;
if( ui.deviceCombo->itemData( ui.deviceCombo->currentIndex() ) != QVariant::Invalid )
discPath = ui.deviceCombo->itemData( ui.deviceCombo->currentIndex() ).toString();
else
discPath = ui.deviceCombo->currentText(); discPath = ui.deviceCombo->currentText();
int tmp = ui.deviceCombo->findText( discPath );
if( tmp != -1 && ui.deviceCombo->itemData( tmp ) != QVariant::Invalid )
discPath = ui.deviceCombo->itemData( tmp ).toString();
/* MRL scheme */ /* MRL scheme */
const char *scheme; const char *scheme;
/* DVD */ /* DVD */
...@@ -573,7 +574,6 @@ void DiscOpenPanel::browseDevice() ...@@ -573,7 +574,6 @@ void DiscOpenPanel::browseDevice()
{ {
ui.deviceCombo->addItem( toNativeSepNoSlash( dir ) ); ui.deviceCombo->addItem( toNativeSepNoSlash( dir ) );
ui.deviceCombo->setCurrentIndex( ui.deviceCombo->findText( toNativeSepNoSlash( dir ) ) ); ui.deviceCombo->setCurrentIndex( ui.deviceCombo->findText( toNativeSepNoSlash( dir ) ) );
updateMRL();
} }
updateMRL(); updateMRL();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment