[Scummvm-git-logs] scummvm master -> 7f583ede1e6d4a6649e719f371fb81171ba4975e

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a94e90d838 BACKENDS: Fix potential race condition in DefaultTimer
7f583ede1e PETKA: Fix warning


Commit: a94e90d83888ad0de5125887ba194552f8351333
    https://github.com/scummvm/scummvm/commit/a94e90d83888ad0de5125887ba194552f8351333
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-25T17:56:15+02:00

Commit Message:
BACKENDS: Fix potential race condition in DefaultTimer

Changed paths:
    backends/timer/default/default-timer.cpp


diff --git a/backends/timer/default/default-timer.cpp b/backends/timer/default/default-timer.cpp
index e3a82837d7..8e2eac21b7 100644
--- a/backends/timer/default/default-timer.cpp
+++ b/backends/timer/default/default-timer.cpp
@@ -84,6 +84,10 @@ void DefaultTimerManager::handler() {
 
 	uint32 curTime = g_system->getMillis(true);
 
+	// On slow systems this could still be run after destructor
+	if (!_head)
+		return;
+
 	// Repeat as long as there is a TimerSlot that is scheduled to fire.
 	TimerSlot *slot = _head->next;
 	while (slot && slot->nextFireTime < curTime) {


Commit: 7f583ede1e6d4a6649e719f371fb81171ba4975e
    https://github.com/scummvm/scummvm/commit/7f583ede1e6d4a6649e719f371fb81171ba4975e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-05-25T17:57:03+02:00

Commit Message:
PETKA: Fix warning

Changed paths:
    engines/petka/interfaces/dialog_interface.h


diff --git a/engines/petka/interfaces/dialog_interface.h b/engines/petka/interfaces/dialog_interface.h
index ecf3f90621..9dcd56a607 100644
--- a/engines/petka/interfaces/dialog_interface.h
+++ b/engines/petka/interfaces/dialog_interface.h
@@ -35,7 +35,7 @@ enum DialogState {
 
 class Sound;
 class QMessageObject;
-class QReaction;
+struct QReaction;
 
 class DialogInterface {
 public: