summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Morph2022-11-28 13:11:17 -0500
committerGravatar GitHub2022-11-28 13:11:17 -0500
commite507c01a225c60a258eb368e55ff285ff743a36f (patch)
tree5142ee9c14b8541cbb50128c382277657bacc5cb /src
parentMerge pull request #9325 from german77/default_by_default (diff)
parentyuzu/main: Merge variable declaration into ifdef (diff)
downloadyuzu-e507c01a225c60a258eb368e55ff285ff743a36f.tar.gz
yuzu-e507c01a225c60a258eb368e55ff285ff743a36f.tar.xz
yuzu-e507c01a225c60a258eb368e55ff285ff743a36f.zip
Merge pull request #9336 from lioncash/themepath
yuzu/main: Merge variable declaration into ifdef
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/main.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp
index 2aae746f0..346d14252 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -4037,7 +4037,6 @@ void GMainWindow::UpdateUITheme() {
4037 const QString default_theme = 4037 const QString default_theme =
4038 QString::fromUtf8(UISettings::themes[static_cast<size_t>(Config::default_theme)].second); 4038 QString::fromUtf8(UISettings::themes[static_cast<size_t>(Config::default_theme)].second);
4039 QString current_theme = UISettings::values.theme; 4039 QString current_theme = UISettings::values.theme;
4040 QStringList theme_paths(default_theme_paths);
4041 4040
4042 if (current_theme.isEmpty()) { 4041 if (current_theme.isEmpty()) {
4043 current_theme = default_theme; 4042 current_theme = default_theme;
@@ -4050,7 +4049,7 @@ void GMainWindow::UpdateUITheme() {
4050 if (current_theme == QStringLiteral("default") || current_theme == QStringLiteral("colorful")) { 4049 if (current_theme == QStringLiteral("default") || current_theme == QStringLiteral("colorful")) {
4051 QIcon::setThemeName(current_theme == QStringLiteral("colorful") ? current_theme 4050 QIcon::setThemeName(current_theme == QStringLiteral("colorful") ? current_theme
4052 : startup_icon_theme); 4051 : startup_icon_theme);
4053 QIcon::setThemeSearchPaths(theme_paths); 4052 QIcon::setThemeSearchPaths(QStringList(default_theme_paths));
4054 if (CheckDarkMode()) { 4053 if (CheckDarkMode()) {
4055 current_theme = QStringLiteral("default_dark"); 4054 current_theme = QStringLiteral("default_dark");
4056 } 4055 }