Merge pull request #9362 from iwubcode/freelook_fix_crash

VideoCommon: Fix crash that occurs on loading a fifo log when Free Look is enabled
dolphin-emu · Dec 27, 2020 · 2917af0 · 2917af0
2 parents ce599f9 + 16dc2fa
commit 2917af0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/Source/Core/VideoCommon/FreeLookCamera.cpp b/Source/Core/VideoCommon/FreeLookCamera.cpp
@@ -175,6 +175,11 @@ class OrbitalController : public CameraController
 };
 }  // namespace
 
+FreeLookCamera::FreeLookCamera()
+{
+  SetControlType(FreeLook::ControlType::SixAxis);
+}
+
 void FreeLookCamera::SetControlType(FreeLook::ControlType type)
 {
   if (m_current_type && *m_current_type == type)

diff --git a/Source/Core/VideoCommon/FreeLookCamera.h b/Source/Core/VideoCommon/FreeLookCamera.h
@@ -41,6 +41,7 @@ class CameraController
 class FreeLookCamera
 {
 public:
+  FreeLookCamera();
   void SetControlType(FreeLook::ControlType type);
   Common::Matrix44 GetView();
   Common::Vec2 GetFieldOfView() const;

diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp
@@ -111,6 +111,7 @@ Renderer::Renderer(int backbuffer_width, int backbuffer_height, float backbuffer
   CalculateTargetSize();
 
   m_is_game_widescreen = SConfig::GetInstance().bWii && Config::Get(Config::SYSCONF_WIDESCREEN);
+  g_freelook_camera.SetControlType(FreeLook::GetActiveConfig().camera_config.control_type);
 }
 
 Renderer::~Renderer() = default;