From 51a9bfc9e2881aa7c7ddaa9cc6b2709acab5e725 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Mon, 13 Jul 2009 18:47:32 +0000
Subject: Refactor GUI options update into a function in Common:
 updateGameGUIOptions.

svn-id: r42446
---
 engines/advancedDetector.cpp | 8 +-------
 engines/scumm/detection.cpp  | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'engines')

diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index d1395fbe04..7d86f3ef32 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -296,13 +296,7 @@ Common::Error AdvancedMetaEngine::createInstance(OSystem *syst, Engine **engine)
 
 	// If the GUI options were updated, we catch this here and update them in the users config
 	// file transparently.
-	const uint32 guiOptions = agdDesc->guioptions | params.guioptions;
-
-	if ((guiOptions && !ConfMan.hasKey("guioptions")) ||
-	    (ConfMan.hasKey("guioptions") && parseGameGUIOptions(ConfMan.get("guioptions")) != guiOptions)) {
-		ConfMan.set("guioptions", Common::getGameGUIOptionsDescription(guiOptions));
-		ConfMan.flushToDisk();
-	}
+	Common::updateGameGUIOptions(agdDesc->guioptions | params.guioptions);
 
 	debug(2, "Running %s", toGameDescriptor(*agdDesc, params.list).description().c_str());
 	if (!createInstance(syst, engine, agdDesc))
diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index e1de825049..5fa74d22c3 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -884,13 +884,7 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co
 
 	// If the GUI options were updated, we catch this here and update them in the users config
 	// file transparently.
-	const uint32 guiOptions = res.game.guioptions;
-
-	if ((guiOptions && !ConfMan.hasKey("guioptions")) ||
-	    (ConfMan.hasKey("guioptions") && parseGameGUIOptions(ConfMan.get("guioptions")) != guiOptions)) {
-		ConfMan.set("guioptions", Common::getGameGUIOptionsDescription(guiOptions));
-		ConfMan.flushToDisk();
-	}
+	Common::updateGameGUIOptions(res.game.guioptions);
 
 	// Finally, we have massaged the GameDescriptor to our satisfaction, and can
 	// instantiate the appropriate game engine. Hooray!
-- 
cgit v1.2.3