From 2ddb6d759a2ce99d6952023dfb888679d61053c1 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 24 Aug 2016 12:54:43 -0700
Subject: [PATCH] GUI: Only reload config if manually saved

---
 CHANGES                      | 1 +
 src/feature/gui/gui-config.c | 1 +
 src/feature/gui/gui-runner.c | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index b6755a8e4..53f464fc2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -76,6 +76,7 @@ Misc:
  - GBA Video: Optimize compositing cases slightly
  - VFS: Improve zip file detection
  - Util: Add endswith
+ - GUI: Only reload config if manually saved
 
 0.4.1: (2016-07-11)
 Bugfixes:
diff --git a/src/feature/gui/gui-config.c b/src/feature/gui/gui-config.c
index dce6a4aeb..c9cb4c4c6 100644
--- a/src/feature/gui/gui-config.c
+++ b/src/feature/gui/gui-config.c
@@ -115,6 +115,7 @@ void mGUIShowConfig(struct mGUIRunner* runner, struct GUIMenuItem* extra, size_t
 				mCoreConfigSetUIntValue(&runner->config, item->data, item->state);
 			}
 			mCoreConfigSave(&runner->config);
+			mCoreLoadForeignConfig(runner->core, &runner->config);
 			break;
 		}
 		if (!strcmp(item->data, "*REMAP")) {
diff --git a/src/feature/gui/gui-runner.c b/src/feature/gui/gui-runner.c
index 09b9428b4..eaac931b8 100644
--- a/src/feature/gui/gui-runner.c
+++ b/src/feature/gui/gui-runner.c
@@ -434,7 +434,6 @@ void mGUIRun(struct mGUIRunner* runner, const char* path) {
 				break;
 			case RUNNER_CONFIG:
 				mGUIShowConfig(runner, runner->configExtra, runner->nConfigExtra);
-				mCoreLoadForeignConfig(runner->core, &runner->config);
 				break;
 			case RUNNER_CONTINUE:
 				break;