From e0e29285fe02874767627c39e8c332d2fb9bfd77 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 21 Sep 2006 04:58:41 +0000
Subject: [PATCH] RegisterTypes() less

---
 stepmania/src/GameLoop.cpp     | 3 +++
 stepmania/src/ThemeManager.cpp | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/GameLoop.cpp b/stepmania/src/GameLoop.cpp
index 675e0514f8..4e7b466638 100644
--- a/stepmania/src/GameLoop.cpp
+++ b/stepmania/src/GameLoop.cpp
@@ -135,6 +135,9 @@ namespace
 		/* Clear theme metrics, so ThemeMetric<apActorCommand>s are cleared. */
 		THEME->ClearSubscribers();
 
+		/* In case the previous theme overloaded class bindings, reinitialize them. */
+		LUA->RegisterTypes();
+
 		THEME->SwitchThemeAndLanguage( g_sNewTheme, THEME->GetCurLanguage(), PREFSMAN->m_bPseudoLocalize );
 		PREFSMAN->m_sTheme.Set( g_sNewTheme );
 
diff --git a/stepmania/src/ThemeManager.cpp b/stepmania/src/ThemeManager.cpp
index 766e8bf55a..1e54e745e1 100644
--- a/stepmania/src/ThemeManager.cpp
+++ b/stepmania/src/ThemeManager.cpp
@@ -473,8 +473,6 @@ void ThemeManager::RunLuaScripts( const RString &sMask )
 
 void ThemeManager::UpdateLuaGlobals()
 {
-	LUA->RegisterTypes();
-
 #if !defined(SMPACKAGE)
 	/* explicitly refresh cached metrics that we use. */
 	ScreenDimensions::ReloadScreenDimensions();