[Scummvm-git-logs] scummvm master -> 87168baf323c9db3acd90d154848fd4f3a554df6
dreammaster
dreammaster at scummvm.org
Thu Sep 15 00:43:44 CEST 2016
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
87168baf32 TITANIC: Add missing CInputHandler destructor
Commit: 87168baf323c9db3acd90d154848fd4f3a554df6
https://github.com/scummvm/scummvm/commit/87168baf323c9db3acd90d154848fd4f3a554df6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-09-14T18:43:15-04:00
Commit Message:
TITANIC: Add missing CInputHandler destructor
Changed paths:
engines/titanic/input_handler.cpp
engines/titanic/input_handler.h
diff --git a/engines/titanic/input_handler.cpp b/engines/titanic/input_handler.cpp
index 2c51f3e..df09cf2 100644
--- a/engines/titanic/input_handler.cpp
+++ b/engines/titanic/input_handler.cpp
@@ -36,6 +36,10 @@ CInputHandler::CInputHandler(CGameManager *owner) :
CScreenManager::_screenManagerPtr->_inputHandler = this;
}
+CInputHandler::~CInputHandler() {
+ CScreenManager::_screenManagerPtr->_inputHandler = nullptr;
+}
+
void CInputHandler::setTranslator(CInputTranslator *translator) {
_inputTranslator = translator;
}
diff --git a/engines/titanic/input_handler.h b/engines/titanic/input_handler.h
index 7244ddc..d5f29b7 100644
--- a/engines/titanic/input_handler.h
+++ b/engines/titanic/input_handler.h
@@ -59,6 +59,7 @@ public:
bool _singleton;
public:
CInputHandler(CGameManager *owner);
+ ~CInputHandler();
void setTranslator(CInputTranslator *translator);
More information about the Scummvm-git-logs
mailing list