COMMON: Fix crash when the keymapper and the event recorder are enabled

DefaultEventManager registers a keymapper that is supposed to be
auto-freed. However, the event recorder then sets itself as a new
keymapper, but because the autofree flag is already set,
registerMapper() ends up deleting the event recorder itself. Setting
the autofree flag before actually freeing the mapper fixes the issue
and prevents ScummVM from crashing on startup

1 files changed, 1 insertions, 1 deletions

diff --git a/common/EventDispatcher.cpp b/common/EventDispatcher.cpp
index e60c1aa7ff..20a5b5eaac 100644
--- a/common/EventDispatcher.cpp
+++ b/common/EventDispatcher.cpp
@@ -71,11 +71,11 @@ void EventDispatcher::dispatch() {
 }
 
 void EventDispatcher::registerMapper(EventMapper *mapper, bool autoFree) {
+	_autoFreeMapper = autoFree;
 	if (_autoFreeMapper) {
 		delete _mapper;
 	}
 	_mapper = mapper;
-	_autoFreeMapper = autoFree;
 }