From 85a766f56035af4c514a364a97d950528c43d62d Mon Sep 17 00:00:00 2001
From: Ilari Liusvaara <ilari.liusvaara@elisanet.fi>
Date: Sun, 6 Jan 2013 17:45:14 +0200
Subject: [PATCH] Remove set_preload_settings(), do the things at ROM load if
 needed

---
 include/core/emucore.hpp  |  2 --
 src/core/bsnes-legacy.cpp | 13 ++++++-------
 src/core/gambatte.cpp     |  4 ----
 src/core/moviedata.cpp    |  3 ---
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/include/core/emucore.hpp b/include/core/emucore.hpp
index 23b3faf0..5f7b719e 100644
--- a/include/core/emucore.hpp
+++ b/include/core/emucore.hpp
@@ -14,8 +14,6 @@
 
 //Do basic core initialization (to get it to stable state).
 void do_basic_core_init();
-//Set preload settings.
-void set_preload_settings();
 //Install handler.
 void core_install_handler();
 //Uninstall handler.
diff --git a/src/core/bsnes-legacy.cpp b/src/core/bsnes-legacy.cpp
index d90b3f8b..da49ae26 100644
--- a/src/core/bsnes-legacy.cpp
+++ b/src/core/bsnes-legacy.cpp
@@ -476,6 +476,8 @@ namespace
 
 		snes_term();
 		snes_unload_cartridge();
+		SNES::config.random = false;
+		SNES::config.expansion_port = SNES::System::ExpansionPortDevice::None;
 		bool r = fun(img);
 		if(r)
 			internal_rom = ctype;
@@ -1084,6 +1086,10 @@ void core_uninstall_handler()
 
 void do_basic_core_init()
 {
+	static bool done = false;
+	if(done)
+		return;
+	done = true;
 	static my_interfaced i;
 	SNES::interface = &i;
 }
@@ -1100,13 +1106,6 @@ std::set<std::string> get_sram_set()
 	return r;
 }
 
-void set_preload_settings()
-{
-	SNES::config.random = false;
-	SNES::config.expansion_port = SNES::System::ExpansionPortDevice::None;
-}
-
-
 void core_request_reset(long delay)
 {
 	do_reset_flag = delay;
diff --git a/src/core/gambatte.cpp b/src/core/gambatte.cpp
index 67950178..198a514d 100644
--- a/src/core/gambatte.cpp
+++ b/src/core/gambatte.cpp
@@ -407,10 +407,6 @@ void do_basic_core_init()
 	instance->set_walltime_fn(walltime_fn);
 }
 
-void set_preload_settings()
-{
-}
-
 void core_install_handler()
 {
 }
diff --git a/src/core/moviedata.cpp b/src/core/moviedata.cpp
index 2c07e3c5..1ae47bc9 100644
--- a/src/core/moviedata.cpp
+++ b/src/core/moviedata.cpp
@@ -237,7 +237,6 @@ void do_load_beginning(bool reload) throw(std::bad_alloc, std::runtime_error)
 		messages << "Can't load movie without a ROM" << std::endl;
 		return;
 	}
-	set_preload_settings();
 
 	//Negative return.
 	if(!reload) {
@@ -322,8 +321,6 @@ void do_load_state(struct moviefile& _movie, int lmode)
 	if(!rom_ok)
 		throw std::runtime_error("Incorrect ROM");
 
-	set_preload_settings();
-
 	if(lmode == LOAD_STATE_CURRENT && movb.get_movie().readonly_mode() && readonly_load_preserves)
 		lmode = LOAD_STATE_PRESERVE;