diff options
| author | WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> | 2021-01-03 16:00:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-03 16:00:50 +0000 |
| commit | 9e15488e95ca6dc2c0dcbd7c4fe77195f5be1b4e (patch) | |
| tree | 04812738551a23271fc583dd0cba8a71b1612107 /src/frontend/qt_sdl/main.cpp | |
| parent | 83648f2d3109bf16ac6f2317ab772803af11f482 (diff) | |
Fix mistake in merge commit
Diffstat (limited to 'src/frontend/qt_sdl/main.cpp')
| -rw-r--r-- | src/frontend/qt_sdl/main.cpp | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/frontend/qt_sdl/main.cpp b/src/frontend/qt_sdl/main.cpp index 91e56f0..1897743 100644 --- a/src/frontend/qt_sdl/main.cpp +++ b/src/frontend/qt_sdl/main.cpp @@ -1465,21 +1465,6 @@ QString MainWindow::loadErrorStr(int error) } } -void MainWindow::onOpenFile() -{ - emuThread->emuPause(); - - QString filename = QFileDialog::getOpenFileName(this, - "Open ROM", - Config::LastROMFolder, - "DS ROMs (*.nds *.dsi *.srl *.zip *.7z);;GBA ROMs (*.gba *.zip *.7z);;Other Compressed ROMs (*.zip *.7z *.rar *.tar *.tar.gz *.tar.xz *tar.bz2);;Any file (*.*)"); - - if (filename.isEmpty()) - { - emuThread->emuUnpause(); - return; - } - void MainWindow::loadROM(QString filename) { recentFileList.removeAll(filename); @@ -1584,7 +1569,7 @@ void MainWindow::onOpenFile() QString filename = QFileDialog::getOpenFileName(this, "Open ROM", Config::LastROMFolder, - "DS ROMs (*.nds *.dsi *.srl);;GBA ROMs (*.gba);;Any file (*.*)"); + "DS ROMs (*.nds *.dsi *.srl *.zip *.7z);;GBA ROMs (*.gba *.zip *.7z);;Other Compressed ROMs (*.zip *.7z *.rar *.tar *.tar.gz *.tar.xz *tar.bz2);;Any file (*.*)"); if (filename.isEmpty()) { emuThread->emuUnpause(); |