[Scummvm-cvs-logs] scummvm master -> ecc43c9b92b0454b3a159b69d684c2ad331896fe

[bluegr]

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:
ecc43c9b92 Revert "COMMON: Fix crash when the keymapper and the event recorder are enabled"


Commit: ecc43c9b92b0454b3a159b69d684c2ad331896fe
    https://github.com/scummvm/scummvm/commit/ecc43c9b92b0454b3a159b69d684c2ad331896fe
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-07-04T17:05:54-07:00

Commit Message:
Revert "COMMON: Fix crash when the keymapper and the event recorder are enabled"

This reverts commit 93987d999c61221bda3da548c8c81f5d6d906a12.

Changed paths:
    common/EventDispatcher.cpp



diff --git a/common/EventDispatcher.cpp b/common/EventDispatcher.cpp
index 20a5b5e..e60c1aa 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;
 }