GUI: regression fix
Improperly resolved git conflict when rebasing savestates.
This commit is contained in:
@@ -500,7 +500,8 @@ void main_window::BootTest()
|
|||||||
const QString file_path = QFileDialog::getOpenFileName(this, tr("Select (S)ELF To Boot"), path_tests, tr(
|
const QString file_path = QFileDialog::getOpenFileName(this, tr("Select (S)ELF To Boot"), path_tests, tr(
|
||||||
"(S)ELF files (*.elf *.self);;"
|
"(S)ELF files (*.elf *.self);;"
|
||||||
"ELF files (*.elf);;"
|
"ELF files (*.elf);;"
|
||||||
"SELF files (*.self);;"),
|
"SELF files (*.self);;"
|
||||||
|
"All files (*.*)"),
|
||||||
Q_NULLPTR, QFileDialog::DontResolveSymlinks);
|
Q_NULLPTR, QFileDialog::DontResolveSymlinks);
|
||||||
|
|
||||||
if (file_path.isEmpty())
|
if (file_path.isEmpty())
|
||||||
|
|||||||
Reference in New Issue
Block a user