CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #944 from lioncash/menu 

qt: Don't show error dialog when canceling the Load Folder dialog
master
bunnei 2018-08-06 21:33:23 +07:00 committed by GitHub
parent 168958f8e2 d33f641912
commit 645d35ac32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/yuzu/main.cpp
Unescape Escape View File

@ -631,9 +631,15 @@ void GMainWindow::OnMenuLoadFile() {
} }
void GMainWindow::OnMenuLoadFolder() { 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) { if (matching_main.size() == 1) {
BootGame(dir.path() + DIR_SEP + matching_main[0]); BootGame(dir.path() + DIR_SEP + matching_main[0]);
} else { } else {