From 321bfe86f8d24954b892efaae0493b2a9a5cda97 Mon Sep 17 00:00:00 2001
From: Mitchell Richters <mjr4077au@gmail.com>
Date: Tue, 20 Apr 2021 20:07:20 +1000
Subject: [PATCH] - `DSkippableScreenJob::OnEvent()`: Ensure previously ignored
 keys don't cause a screenjob to skip.

* Volume up/down on the keyboard when trying to listen to a cut-scene shouldn't skip it.
---
 source/core/screenjob.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/source/core/screenjob.cpp b/source/core/screenjob.cpp
index 02cdd3ede..87cd92b79 100644
--- 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;
 }