summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/Src/EventHandler.cpp
diff options
context:
space:
mode:
authordonkopunchstania <donkopunchstania@gmail.com>2010-02-16 04:34:41 +0000
committerdonkopunchstania <donkopunchstania@gmail.com>2010-02-16 04:34:41 +0000
commit9254a2ddb593542f224342d9ff9fd9a072b5cc44 (patch)
tree7cd5417d34f75632cd2e342da5d2017650a4d070 /Source/Core/InputCommon/Src/EventHandler.cpp
parent666a33eeedcc3fbfa2ae035ea3afa48c84fe3274 (diff)
Fixed a few memory leaks. Made Init and Shutdown functions for some core systems.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5064 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/InputCommon/Src/EventHandler.cpp')
-rw-r--r--Source/Core/InputCommon/Src/EventHandler.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/Src/EventHandler.cpp b/Source/Core/InputCommon/Src/EventHandler.cpp
index 81890202db..19dc819baf 100644
--- a/Source/Core/InputCommon/Src/EventHandler.cpp
+++ b/Source/Core/InputCommon/Src/EventHandler.cpp
@@ -19,13 +19,15 @@ EventHandler::~EventHandler() {
EventHandler *EventHandler::GetInstance() {
// fprintf(stderr, "handler instance %p\n", m_Instance);
+ return m_Instance;
+}
- if (! m_Instance)
+void EventHandler::Init()
+{
m_Instance = new EventHandler();
- return m_Instance;
}
-void EventHandler::Destroy() {
+void EventHandler::Shutdown() {
if (m_Instance)
delete m_Instance;
// fprintf(stderr, "deleting instance %p\n", m_Instance);