From 65568b54b6c80890a4567dc4a01c9d285d611f97 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Thu, 17 Jan 2013 01:12:40 -0800
Subject: [PATCH] Let's actually call Init/Shutdown in CoreTiming.

---
 Core/System.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Core/System.cpp b/Core/System.cpp
index 86917745e..ac06c66d4 100644
--- a/Core/System.cpp
+++ b/Core/System.cpp
@@ -65,6 +65,8 @@ bool PSP_Init(const CoreParameter &coreParam, std::string *error_string)
 		LogManager::GetInstance()->SetEnable(LogTypes::G3D, false);
 	}
 
+	CoreTiming::Init();
+
 	// Init all the HLE modules
 	HLEInit();
 
@@ -73,8 +75,7 @@ bool PSP_Init(const CoreParameter &coreParam, std::string *error_string)
 	if (!LoadFile(coreParameter.fileToStart.c_str(), error_string))
 	{
 		pspFileSystem.Shutdown();
-		CoreTiming::ClearPendingEvents();
-		CoreTiming::UnregisterAllEvents();
+		CoreTiming::Shutdown();
 		__KernelShutdown();
 		HLEShutdown();
 		host->ShutdownSound();
@@ -102,8 +103,7 @@ void PSP_Shutdown()
 
 	TextureCache_Clear(true);
 
-	CoreTiming::ClearPendingEvents();
-	CoreTiming::UnregisterAllEvents();
+	CoreTiming::Shutdown();
 
 	if (coreParameter.enableSound)
 	{