From 2451a41a48ae283bc66bd85f8a34093233552a53 Mon Sep 17 00:00:00 2001
From: Jordan Woyak <jordan.woyak@gmail.com>
Date: Tue, 25 Feb 2020 18:36:56 -0600
Subject: [PATCH] DolphinQt: Fix calibration cancel behavior.

---
 .../Config/Mapping/MappingIndicator.cpp       | 21 ++++++++-----------
 .../Config/Mapping/MappingIndicator.h         |  4 +---
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
index 71782e0f74..bc27985915 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.cpp
@@ -825,11 +825,11 @@ void CalibrationWidget::SetupActions()
 
   connect(calibrate_action, &QAction::triggered, [this]() {
     StartCalibration();
-    m_input.SetCenter({0, 0});
+    m_new_center = Common::DVec2{};
   });
   connect(center_action, &QAction::triggered, [this]() {
     StartCalibration();
-    m_is_centering = true;
+    m_new_center = std::nullopt;
   });
   connect(reset_action, &QAction::triggered, [this]() {
     m_input.SetCalibrationToDefault();
@@ -846,7 +846,7 @@ void CalibrationWidget::SetupActions()
 
   m_completion_action = new QAction(tr("Finish Calibration"), this);
   connect(m_completion_action, &QAction::triggered, [this]() {
-    m_input.SetCenter(m_new_center);
+    m_input.SetCenter(GetCenter());
     m_input.SetCalibrationData(std::move(m_calibration_data));
     m_informative_timer->stop();
     SetupActions();
@@ -857,8 +857,6 @@ void CalibrationWidget::StartCalibration()
 {
   m_calibration_data.assign(m_input.CALIBRATION_SAMPLE_COUNT, 0.0);
 
-  m_new_center = {0, 0};
-
   // Cancel calibration.
   const auto cancel_action = new QAction(tr("Cancel Calibration"), this);
   connect(cancel_action, &QAction::triggered, [this]() {
@@ -883,14 +881,13 @@ void CalibrationWidget::Update(Common::DVec2 point)
   QFont f = parentWidget()->font();
   QPalette p = parentWidget()->palette();
 
-  if (m_is_centering)
-  {
+  // Use current point if center is being calibrated.
+  if (!m_new_center.has_value())
     m_new_center = point;
-    m_is_centering = false;
-  }
-  else if (IsCalibrating())
+
+  if (IsCalibrating())
   {
-    m_input.UpdateCalibrationData(m_calibration_data, point - m_new_center);
+    m_input.UpdateCalibrationData(m_calibration_data, point - *m_new_center);
 
     if (IsCalibrationDataSensible(m_calibration_data))
     {
@@ -920,5 +917,5 @@ double CalibrationWidget::GetCalibrationRadiusAtAngle(double angle) const
 
 Common::DVec2 CalibrationWidget::GetCenter() const
 {
-  return m_new_center;
+  return m_new_center.value_or(Common::DVec2{});
 }
diff --git a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h
index 7a57af3fb0..763c9e3db7 100644
--- a/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h
+++ b/Source/Core/DolphinQt/Config/Mapping/MappingIndicator.h
@@ -203,7 +203,5 @@ private:
   QAction* m_completion_action;
   ControllerEmu::ReshapableInput::CalibrationData m_calibration_data;
   QTimer* m_informative_timer;
-
-  bool m_is_centering = false;
-  Common::DVec2 m_new_center;
+  std::optional<Common::DVec2> m_new_center;
 };