From 7f86ebc4e6f8f1d24f2a6276a65b0f2635aad81c Mon Sep 17 00:00:00 2001
From: Vicki Pfau <vi@endrift.com>
Date: Wed, 22 May 2019 11:15:21 -0700
Subject: [PATCH] Qt: Preserve native FPS target when saving settings

---
 src/platform/qt/SettingsView.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/platform/qt/SettingsView.cpp b/src/platform/qt/SettingsView.cpp
index d5d0a91ac..9acf56a99 100644
--- a/src/platform/qt/SettingsView.cpp
+++ b/src/platform/qt/SettingsView.cpp
@@ -370,7 +370,6 @@ void SettingsView::updateConfig() {
 	saveSetting("videoSync", m_ui.videoSync);
 	saveSetting("audioSync", m_ui.audioSync);
 	saveSetting("frameskip", m_ui.frameskip);
-	saveSetting("fpsTarget", m_ui.fpsTarget);
 	saveSetting("autofireThreshold", m_ui.autofireThreshold);
 	saveSetting("lockAspectRatio", m_ui.lockAspectRatio);
 	saveSetting("lockIntegerScaling", m_ui.lockIntegerScaling);
@@ -409,6 +408,13 @@ void SettingsView::updateConfig() {
 		saveSetting("fastForwardRatio", m_ui.fastForwardRatio);
 	}
 
+	double nativeFps = double(GBA_ARM7TDMI_FREQUENCY) / double(VIDEO_TOTAL_LENGTH);
+	if (nativeFps - m_ui.fpsTarget->value() < 0.0001) {
+		m_controller->setOption("fpsTarget", QVariant(nativeFps));
+	} else {
+		saveSetting("fpsTarget", m_ui.fpsTarget);
+	}
+
 	switch (m_ui.idleOptimization->currentIndex() + IDLE_LOOP_IGNORE) {
 	case IDLE_LOOP_IGNORE:
 		saveSetting("idleOptimization", "ignore");