diff options
Diffstat (limited to 'src/citra')
| -rw-r--r-- | src/citra/citra.cpp | 3 | ||||
| -rw-r--r-- | src/citra/config.cpp | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/citra/citra.cpp b/src/citra/citra.cpp index dd357ff72..14574e56c 100644 --- a/src/citra/citra.cpp +++ b/src/citra/citra.cpp | |||
| @@ -18,7 +18,10 @@ | |||
| 18 | #endif | 18 | #endif |
| 19 | 19 | ||
| 20 | #ifdef _WIN32 | 20 | #ifdef _WIN32 |
| 21 | // windows.h needs to be included before shellapi.h | ||
| 21 | #include <windows.h> | 22 | #include <windows.h> |
| 23 | |||
| 24 | #include <shellapi.h> | ||
| 22 | #endif | 25 | #endif |
| 23 | 26 | ||
| 24 | #include "citra/config.h" | 27 | #include "citra/config.h" |
diff --git a/src/citra/config.cpp b/src/citra/config.cpp index f08b4069c..957d8dc86 100644 --- a/src/citra/config.cpp +++ b/src/citra/config.cpp | |||
| @@ -88,9 +88,9 @@ void Config::ReadValues() { | |||
| 88 | Settings::values.toggle_framelimit = | 88 | Settings::values.toggle_framelimit = |
| 89 | sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true); | 89 | sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true); |
| 90 | 90 | ||
| 91 | Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 1.0); | 91 | Settings::values.bg_red = (float)sdl2_config->GetReal("Renderer", "bg_red", 0.0); |
| 92 | Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 1.0); | 92 | Settings::values.bg_green = (float)sdl2_config->GetReal("Renderer", "bg_green", 0.0); |
| 93 | Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 1.0); | 93 | Settings::values.bg_blue = (float)sdl2_config->GetReal("Renderer", "bg_blue", 0.0); |
| 94 | 94 | ||
| 95 | // Layout | 95 | // Layout |
| 96 | Settings::values.layout_option = | 96 | Settings::values.layout_option = |