summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-01-13 12:04:27 -0500
committerGitHub <noreply@github.com>2017-01-13 12:04:27 -0500
commitba271f65698a322f6cb125ac11bcb4c8bda0068d (patch)
treee6c2ef23a944828bed5f433c47b93e9a4f8736e1 /src
parent1d088c637cd36a741122d68076a1ff0e9dee9fa8 (diff)
parenta851aa4cf10aa352632cdca741acfa62b24d7b18 (diff)
Merge pull request #2423 from Kloen/floats-should-be-float
SDL2: Config, fix double to float warning
Diffstat (limited to 'src')
-rw-r--r--src/citra/config.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index bd8ac563b..1d0faf193 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -63,7 +63,8 @@ void Config::ReadValues() {
// Renderer
Settings::values.use_hw_renderer = sdl2_config->GetBoolean("Renderer", "use_hw_renderer", true);
Settings::values.use_shader_jit = sdl2_config->GetBoolean("Renderer", "use_shader_jit", true);
- Settings::values.resolution_factor = sdl2_config->GetReal("Renderer", "resolution_factor", 1.0);
+ Settings::values.resolution_factor =
+ (float)sdl2_config->GetReal("Renderer", "resolution_factor", 1.0);
Settings::values.use_vsync = sdl2_config->GetBoolean("Renderer", "use_vsync", false);
Settings::values.toggle_framelimit =
sdl2_config->GetBoolean("Renderer", "toggle_framelimit", true);