ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7814 from JosJuice/overwrite-aspect-mode 

VideoConfig: Don't overwrite aspect_mode with suggested_aspect_mode
This commit is contained in:
Mat M 2019-02-25 13:29:03 -05:00 committed by GitHub
parent fad9c0cc93 ea7b96342b
commit d27036eb77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/VideoCommon/VideoConfig.cpp
View File

@ -74,12 +74,8 @@ void VideoConfig::Refresh()
iAdapter = Config::Get(Config::GFX_ADAPTER); iAdapter = Config::Get(Config::GFX_ADAPTER);
bWidescreenHack = Config::Get(Config::GFX_WIDESCREEN_HACK); bWidescreenHack = Config::Get(Config::GFX_WIDESCREEN_HACK);
const AspectMode config_aspect_mode = Config::Get(Config::GFX_ASPECT_RATIO); aspect_mode = Config::Get(Config::GFX_ASPECT_RATIO);
suggested_aspect_mode = Config::Get(Config::GFX_SUGGESTED_ASPECT_RATIO); suggested_aspect_mode = Config::Get(Config::GFX_SUGGESTED_ASPECT_RATIO);
if (config_aspect_mode == AspectMode::Auto)
aspect_mode = suggested_aspect_mode;
else
aspect_mode = config_aspect_mode;
bCrop = Config::Get(Config::GFX_CROP); bCrop = Config::Get(Config::GFX_CROP);
iSafeTextureCache_ColorSamples = Config::Get(Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES); iSafeTextureCache_ColorSamples = Config::Get(Config::GFX_SAFE_TEXTURE_CACHE_COLOR_SAMPLES);
bShowFPS = Config::Get(Config::GFX_SHOW_FPS); bShowFPS = Config::Get(Config::GFX_SHOW_FPS);