diff options
| author | 2022-11-28 08:40:38 -0500 | |
|---|---|---|
| committer | 2022-11-28 08:40:41 -0500 | |
| commit | e96f55b6e2e982b517637af724f39dede30bd429 (patch) | |
| tree | 5142ee9c14b8541cbb50128c382277657bacc5cb | |
| parent | Merge pull request #9325 from german77/default_by_default (diff) | |
| download | yuzu-e96f55b6e2e982b517637af724f39dede30bd429.tar.gz yuzu-e96f55b6e2e982b517637af724f39dede30bd429.tar.xz yuzu-e96f55b6e2e982b517637af724f39dede30bd429.zip | |
yuzu/main: Merge variable declaration into ifdef
This is only used in the non-Windows path.
| -rw-r--r-- | src/yuzu/main.cpp | 3 |
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 | } |