Fix incorrect access to std::optional

1 files changed, 16 insertions, 12 deletions

diff --git a/src/SSVOpenHexagon/Core/HGUpdate.cpp b/src/SSVOpenHexagon/Core/HGUpdate.cpp
index dff026fd..afe5eb47 100644
--- a/src/SSVOpenHexagon/Core/HGUpdate.cpp
+++ b/src/SSVOpenHexagon/Core/HGUpdate.cpp
@@ -786,30 +786,34 @@ void HexagonGame::updateRotation(ssvu::FT mFT)
 
 void HexagonGame::updateCameraShake(ssvu::FT mFT)
 {
-    if(!backgroundCamera.has_value() || !overlayCamera.has_value())
+    if(!backgroundCamera.has_value() || !overlayCamera.has_value() ||
+        status.cameraShake <= 0)
     {
         return;
     }
 
-    if(status.cameraShake <= 0)
-    {
-        backgroundCamera->setCenter(
-            preShakeCenters->backgroundCameraPreShakeCenter);
-
-        overlayCamera->setCenter(preShakeCenters->overlayCameraPreShakeCenter);
-
-        preShakeCenters.reset();
-        return;
-    }
-
     status.cameraShake -= mFT;
 
     if(!preShakeCenters.has_value())
     {
+        if(status.cameraShake <= 0)
+        {
+            backgroundCamera->setCenter(
+                preShakeCenters->backgroundCameraPreShakeCenter);
+
+            overlayCamera->setCenter(
+                preShakeCenters->overlayCameraPreShakeCenter);
+
+            preShakeCenters.reset();
+            return;
+        }
+
         preShakeCenters = PreShakeCenters{
             backgroundCamera->getCenter(), overlayCamera->getCenter()};
     }
 
+    SSVOH_ASSERT(backgroundCamera.has_value());
+    SSVOH_ASSERT(overlayCamera.has_value());
     SSVOH_ASSERT(preShakeCenters.has_value());
 
     const auto makeShakeVec = [this]