diff options
| author | bunnei <bunneidev@gmail.com> | 2018-08-07 03:33:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 03:33:23 +0200 |
| commit | 645d35ac322ebbaa058f24a020bbba987d65708f (patch) | |
| tree | 6256bf8f089a6839e3df811fd90d4bb6a5975901 | |
| parent | Merge pull request #942 from lioncash/default (diff) | |
| parent | qt: Don't show error dialog when canceling the Load Folder dialog (diff) | |
| download | yuzu-645d35ac322ebbaa058f24a020bbba987d65708f.tar yuzu-645d35ac322ebbaa058f24a020bbba987d65708f.tar.gz yuzu-645d35ac322ebbaa058f24a020bbba987d65708f.tar.bz2 yuzu-645d35ac322ebbaa058f24a020bbba987d65708f.tar.lz yuzu-645d35ac322ebbaa058f24a020bbba987d65708f.tar.xz yuzu-645d35ac322ebbaa058f24a020bbba987d65708f.tar.zst yuzu-645d35ac322ebbaa058f24a020bbba987d65708f.zip | |
| -rw-r--r-- | src/yuzu/main.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index d0415a7dc..886288c0d 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -631,9 +631,15 @@ void GMainWindow::OnMenuLoadFile() { } void GMainWindow::OnMenuLoadFolder() { - QDir dir = QFileDialog::getExistingDirectory(this, tr("Open Extracted ROM Directory")); + const QString dir_path = + QFileDialog::getExistingDirectory(this, tr("Open Extracted ROM Directory")); - QStringList matching_main = dir.entryList(QStringList("main"), QDir::Files); + if (dir_path.isNull()) { + return; + } + + const QDir dir{dir_path}; + const QStringList matching_main = dir.entryList(QStringList("main"), QDir::Files); if (matching_main.size() == 1) { BootGame(dir.path() + DIR_SEP + matching_main[0]); } else { |