- DSkippableScreenJob::OnEvent(): Ensure previously ignored keys do…

…n't cause a screenjob to skip. * Volume up/down on the keyboard when trying to listen to a cut-scene shouldn't skip it.
ZDoom · Apr 20, 2021 · 321bfe8 · 321bfe8 · coelckers · Apr 20, 2021
1 parent a919e52
commit 321bfe8
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/source/core/screenjob.cpp b/source/core/screenjob.cpp
@@ -61,8 +61,13 @@ bool DSkippableScreenJob::OnEvent(event_t* evt)
 {
 	if (evt->type == EV_KeyDown)
 	{
-		state = skipped;
-		Skipped();
+		auto& key = evt->data1;
+		bool ignoredkeys = key == KEY_VOLUMEDOWN || key == KEY_VOLUMEUP || (key > KEY_LASTJOYBUTTON && key < KEY_PAD_LTHUMB_RIGHT);
+		if (!ignoredkeys)
+		{
+			state = skipped;
+			Skipped();
+		}
 	}
 	return true;
 }