[Scummvm-git-logs] scummvm master -> 0f96d7b7765116b7b7cd67f05dd2d2dfb1070b0d

[sev-]

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:
0f96d7b776 PINK: fixed pausing when menu bar disappears


Commit: 0f96d7b7765116b7b7cd67f05dd2d2dfb1070b0d
    https://github.com/scummvm/scummvm/commit/0f96d7b7765116b7b7cd67f05dd2d2dfb1070b0d
Author: Andrei Prykhodko (whiterandrek at gmail.com)
Date: 2020-05-08T18:31:08+02:00

Commit Message:
PINK: fixed pausing when menu bar disappears

Changed paths:
    engines/pink/gui.cpp
    engines/pink/pink.cpp


diff --git a/engines/pink/gui.cpp b/engines/pink/gui.cpp
index 79179f5103..addefbe4d6 100644
--- a/engines/pink/gui.cpp
+++ b/engines/pink/gui.cpp
@@ -155,8 +155,6 @@ void PinkEngine::executeMenuCommand(uint id) {
 
 	case kSaveAction:
 	case kSaveAsAction:
-		//FIXME: Somehow messes up the pause system causing issues such as
-		//frozen animations and BGM disappearing
 		saveGameDialog();
 		break;
 
diff --git a/engines/pink/pink.cpp b/engines/pink/pink.cpp
index 13c4b34718..e99c68dbde 100644
--- a/engines/pink/pink.cpp
+++ b/engines/pink/pink.cpp
@@ -160,8 +160,14 @@ Common::Error Pink::PinkEngine::run() {
 }
 
 void PinkEngine::pauseEngine(void *engine, bool pause) {
-	PinkEngine *vm = (PinkEngine*)engine;
-	vm->pauseEngineIntern(pause);
+	Engine *vm = (Engine *)engine;
+	if (pause) {
+		vm->pauseEngine(true);
+	} else {
+		while (vm->isPaused()) {
+			vm->pauseEngine(false);
+		}
+	}
 }
 
 void PinkEngine::load(Archive &archive) {