Merge pull request #1085 from waddlesplash/refactoring

Migrate global init stuff into UICommon.

1 files changed, 4 insertions, 10 deletions

diff --git a/Source/Core/DolphinWX/MainNoGUI.cpp b/Source/Core/DolphinWX/MainNoGUI.cpp
index e000a5a9de..ebe1d97c30 100644
--- a/Source/Core/DolphinWX/MainNoGUI.cpp
+++ b/Source/Core/DolphinWX/MainNoGUI.cpp
@@ -22,6 +22,8 @@
 #include "Core/HW/Wiimote.h"
 #include "Core/PowerPC/PowerPC.h"
 
+#include "UICommon/UICommon.h"
+
 #include "VideoCommon/VideoBackendBase.h"
 
 static bool rendererHasFocus = true;
@@ -347,12 +349,7 @@ int main(int argc, char* argv[])
 		return 1;
 	}
 
-	LogManager::Init();
-	SConfig::Init();
-	VideoBackend::PopulateList();
-	VideoBackend::ActivateBackend(SConfig::GetInstance().
-		m_LocalCoreStartupParameter.m_strVideoBackend);
-	WiimoteReal::LoadSettings();
+	UICommon::Init();
 
 	platform->Init();
 
@@ -372,10 +369,7 @@ int main(int argc, char* argv[])
 
 	platform->Shutdown();
 	Core::Shutdown();
-	WiimoteReal::Shutdown();
-	VideoBackend::ClearList();
-	SConfig::Shutdown();
-	LogManager::Shutdown();
+	UICommon::Shutdown();
 
 	delete platform;