diff options
| author | bunnei <bunneidev@gmail.com> | 2018-10-14 14:44:49 -0400 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 14:44:49 -0400 | 
| commit | 3203193a673f65d093a6ace18a034e1add4d8828 (patch) | |
| tree | e6d6ea028ee8d07bc8e864d8b3732d17ea381d44 | |
| parent | 14286f70f069f1db3c0c3ad42fc78b5d5504da7d (diff) | |
| parent | a4c57436fc157ccfcc6b3a93555b312fd1d14851 (diff) | |
Merge pull request #1490 from lioncash/boot
yuzu/main: Simplify OnMenuLoadFile()
| -rw-r--r-- | src/yuzu/main.cpp | 26 | 
1 files changed, 12 insertions, 14 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index beb57ea5d..cc92ea5b8 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -908,22 +908,20 @@ void GMainWindow::OnGameListNavigateToGamedbEntry(u64 program_id,  }  void GMainWindow::OnMenuLoadFile() { -    QString extensions; -    for (const auto& piece : game_list->supported_file_extensions) -        extensions += "*." + piece + " "; +    const QString extensions = +        QString("*.").append(GameList::supported_file_extensions.join(" *.")).append(" main"); +    const QString file_filter = tr("Switch Executable (%1);;All Files (*.*)", +                                   "%1 is an identifier for the Switch executable file extensions.") +                                    .arg(extensions); +    const QString filename = QFileDialog::getOpenFileName( +        this, tr("Load File"), UISettings::values.roms_path, file_filter); -    extensions += "main "; - -    QString file_filter = tr("Switch Executable") + " (" + extensions + ")"; -    file_filter += ";;" + tr("All Files (*.*)"); - -    QString filename = QFileDialog::getOpenFileName(this, tr("Load File"), -                                                    UISettings::values.roms_path, file_filter); -    if (!filename.isEmpty()) { -        UISettings::values.roms_path = QFileInfo(filename).path(); - -        BootGame(filename); +    if (filename.isEmpty()) { +        return;      } + +    UISettings::values.roms_path = QFileInfo(filename).path(); +    BootGame(filename);  }  void GMainWindow::OnMenuLoadFolder() {  | 
