diff options
author | James Rowe <jroweboy@gmail.com> | 2018-08-06 21:54:15 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-06 21:54:15 +0200 |
commit | bf51bbffcbec41aae4fa6424441aec07ec159880 (patch) | |
tree | 19a37e3239029a34164807362d16714edad34b0e | |
parent | Merge pull request #933 from lioncash/memory (diff) | |
parent | qt/main: Better file-existence checking within OnMenuRecentFile() and UpdateUITheme() (diff) | |
download | yuzu-bf51bbffcbec41aae4fa6424441aec07ec159880.tar yuzu-bf51bbffcbec41aae4fa6424441aec07ec159880.tar.gz yuzu-bf51bbffcbec41aae4fa6424441aec07ec159880.tar.bz2 yuzu-bf51bbffcbec41aae4fa6424441aec07ec159880.tar.lz yuzu-bf51bbffcbec41aae4fa6424441aec07ec159880.tar.xz yuzu-bf51bbffcbec41aae4fa6424441aec07ec159880.tar.zst yuzu-bf51bbffcbec41aae4fa6424441aec07ec159880.zip |
-rw-r--r-- | src/yuzu/main.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index e28679cd1..d0415a7dc 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -654,9 +654,8 @@ void GMainWindow::OnMenuRecentFile() { QAction* action = qobject_cast<QAction*>(sender()); assert(action); - QString filename = action->data().toString(); - QFileInfo file_info(filename); - if (file_info.exists()) { + const QString filename = action->data().toString(); + if (QFileInfo::exists(filename)) { BootGame(filename); } else { // Display an error message and remove the file from the list. @@ -947,15 +946,14 @@ void GMainWindow::UpdateUITheme() { QStringList theme_paths(default_theme_paths); if (UISettings::values.theme != UISettings::themes[0].second && !UISettings::values.theme.isEmpty()) { - QString theme_uri(":" + UISettings::values.theme + "/style.qss"); + const QString theme_uri(":" + UISettings::values.theme + "/style.qss"); QFile f(theme_uri); - if (!f.exists()) { - LOG_ERROR(Frontend, "Unable to set style, stylesheet file not found"); - } else { - f.open(QFile::ReadOnly | QFile::Text); + if (f.open(QFile::ReadOnly | QFile::Text)) { QTextStream ts(&f); qApp->setStyleSheet(ts.readAll()); GMainWindow::setStyleSheet(ts.readAll()); + } else { + LOG_ERROR(Frontend, "Unable to set style, stylesheet file not found"); } theme_paths.append(QStringList{":/icons/default", ":/icons/" + UISettings::values.theme}); QIcon::setThemeName(":/icons/" + UISettings::values.theme); |