From d33f641912f987b65e696d158f190519a4d50c01 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 6 Aug 2018 14:02:31 -0400 Subject: [PATCH] qt: Don't show error dialog when canceling the Load Folder dialog Previously, when canceling out of the Load Folder dialog, a user would get an error dialog about the selected folder not containing a main file, however, by canceling out of the dialog, no selection was actually made. --- src/yuzu/main.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index e28679cd1..bb7f93a8c 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 {