diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /backends/platform/android/android.cpp | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'backends/platform/android/android.cpp')
| -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); } |