Merge pull request #6290 from JosJuice/invalid-aspect-ratio

Treat invalid aspect ratio setting values as Auto
dolphin-emu · Jan 8, 2018 · 22f4696 · 22f4696
2 parents 29e8806 + 1557e6a
commit 22f4696
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
@@ -307,9 +307,6 @@ void Renderer::DrawDebugText()
     const char* ar_text = "";
     switch (g_ActiveConfig.aspect_mode)
     {
-    case AspectMode::Auto:
-      ar_text = "Auto";
-      break;
     case AspectMode::Stretch:
       ar_text = "Stretch";
       break;
@@ -319,6 +316,10 @@ void Renderer::DrawDebugText()
     case AspectMode::AnalogWide:
       ar_text = "Force 16:9";
       break;
+    case AspectMode::Auto:
+    default:
+      ar_text = "Auto";
+      break;
     }
 
     const char* const efbcopy_text = g_ActiveConfig.bSkipEFBCopyToRam ? "to Texture" : "to RAM";
@@ -441,6 +442,7 @@ void Renderer::UpdateDrawRectangle()
       target_aspect = AspectToWidescreen(VideoInterface::GetAspectRatio());
       break;
     case AspectMode::Auto:
+    default:
       target_aspect = source_aspect;
       break;
     }

diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h
@@ -24,15 +24,15 @@
 
 constexpr int EFB_SCALE_AUTO_INTEGRAL = 0;
 
-enum class AspectMode
+enum class AspectMode : int
 {
   Auto,
   AnalogWide,
   Analog,
   Stretch,
 };
 
-enum class StereoMode
+enum class StereoMode : int
 {
   Off,
   SBS,