summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelle Raaijmakers <jelle@gmta.nl>2022-01-09 23:18:02 +0100
committerLinus Groh <mail@linusgroh.de>2022-01-09 23:23:01 +0100
commit1d627f1b2c3ce8cf62b44d746b64466d4cef0817 (patch)
tree4b661a366cff0478735d02db1f94408612904d98
parent3ce1118af1203c45f5e19563f55ca280a50c2892 (diff)
downloadserenity-1d627f1b2c3ce8cf62b44d746b64466d4cef0817.zip
Ports: Patch out SDL timer lock from ScummVM
This change is backported from upstream master and prevents unnecessary spam to our debug console about NULL mutexes.
-rw-r--r--Ports/scummvm/patches/remove-sdl-timer-lock.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/Ports/scummvm/patches/remove-sdl-timer-lock.patch b/Ports/scummvm/patches/remove-sdl-timer-lock.patch
new file mode 100644
index 0000000000..0fba134ea3
--- /dev/null
+++ b/Ports/scummvm/patches/remove-sdl-timer-lock.patch
@@ -0,0 +1,23 @@
+--- scummvm-2.5.1/backends/timer/sdl/sdl-timer.cpp 2021-12-24 22:19:28.000000000 +0000
++++ scummvm-2.5.1-patched/backends/timer/sdl/sdl-timer.cpp 2022-01-09 22:17:13.919057360 +0000
+@@ -29,11 +29,7 @@
+
+ #include "common/textconsole.h"
+
+-OSystem::MutexRef timerMutex;
+-
+ static Uint32 timer_handler(Uint32 interval, void *param) {
+- Common::StackLock lock(timerMutex);
+-
+ ((DefaultTimerManager *)param)->handler();
+ return interval;
+ }
+@@ -49,8 +45,6 @@
+ }
+
+ SdlTimerManager::~SdlTimerManager() {
+- Common::StackLock lock(timerMutex);
+-
+ // Removes the timer callback
+ SDL_RemoveTimer(_timerID);
+