[Scummvm-git-logs] scummvm master -> dac1962ef6e71f1c6b69c291750dda3a867d50b5

[dreammaster]

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:
dac1962ef6 CHEWY: Extra quit checks during flic play


Commit: dac1962ef6e71f1c6b69c291750dda3a867d50b5
    https://github.com/scummvm/scummvm/commit/dac1962ef6e71f1c6b69c291750dda3a867d50b5
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2022-03-04T20:02:44-08:00

Commit Message:
CHEWY: Extra quit checks during flic play

Changed paths:
    engines/chewy/r_event.cpp


diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index 07bdb7212a4..26734329139 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -868,6 +868,7 @@ static void flic_proc1() {
 
 		bool flag;
 		do {
+			SHOULD_QUIT_RETURN;
 			_G(flic_val2) = VALS1[i];
 #ifndef NEW_VIDEO_CODE
 			_G(mem)->file->select_pool_item(_G(Ci).Handle, _G(flic_val2));
@@ -1167,6 +1168,8 @@ void flic_cut(int16 nr) {
 	}
 
 	g_engine->_sound->stopSound();
+	SHOULD_QUIT_RETURN;
+
 	g_events->delay(50);
 	g_engine->_sound->setSoundVolume(_G(spieler).SoundVol * Audio::Mixer::kMaxChannelVolume / 120);
 	g_engine->_sound->setMusicVolume(_G(spieler).MusicVol * Audio::Mixer::kMaxChannelVolume / 120);