diff options
| author | Alyssa Milburn | 2011-10-21 14:25:53 +0200 |
|---|---|---|
| committer | Alyssa Milburn | 2011-10-21 14:28:02 +0200 |
| commit | c382c0c19522ce4771b74ac02377e75350550dd7 (patch) | |
| tree | 583c054e1661409f784b1ee9bb0b86a79eb75d21 | |
| parent | ae96d76da2bd187a571f6a80f0e24fddec96efc3 (diff) | |
| download | scummvm-rg350-c382c0c19522ce4771b74ac02377e75350550dd7.tar.gz scummvm-rg350-c382c0c19522ce4771b74ac02377e75350550dd7.tar.bz2 scummvm-rg350-c382c0c19522ce4771b74ac02377e75350550dd7.zip | |
ANDROID: Delete _timerManager in OSystem_Android's destructor.
If we leave it for OSystem, the DefaultTimerManager destructor tries
constructing a StackLock which, predictably, calls a pure virtual
function, because OSystem_Android's destructor is finished.
| -rw-r--r-- | backends/platform/android/android.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp index a935bf145d..aba31320ea 100644 --- a/backends/platform/android/android.cpp +++ b/backends/platform/android/android.cpp @@ -174,6 +174,8 @@ OSystem_Android::~OSystem_Android() { _mixer = 0; delete _fsFactory; _fsFactory = 0; + delete _timerManager; + _timerManager = 0; deleteMutex(_event_queue_lock); } |