From cffb2566dfc3eede60def856bedc51a4cfa36af4 Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Fri, 9 Dec 2022 08:31:21 +0000
Subject: [PATCH] Fix timedemo on SDL1

---
 Source/engine/demomode.cpp | 4 ++--
 Source/utils/display.cpp   | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Source/engine/demomode.cpp b/Source/engine/demomode.cpp
index 34daf217a..8aa632062 100644
--- a/Source/engine/demomode.cpp
+++ b/Source/engine/demomode.cpp
@@ -265,8 +265,8 @@ bool LoadDemoMessages(int i)
 			case 0x100: // SDL_QUIT
 				break;
 			default:
-				if (eventType < SDL_USEREVENT) {
-					app_fatal(StrCat("Unknown event ", static_cast<uint32_t>(eventType)));
+				if (eventType < 0x8000) { // SDL_USEREVENT
+					app_fatal(StrCat("Unknown event ", eventType));
 				}
 				break;
 			}
diff --git a/Source/utils/display.cpp b/Source/utils/display.cpp
index deec73af9..4f8ad748f 100644
--- a/Source/utils/display.cpp
+++ b/Source/utils/display.cpp
@@ -497,6 +497,8 @@ SDL_Surface *GetOutputSurface()
 bool OutputRequiresScaling()
 {
 #ifdef USE_SDL1
+	if (HeadlessMode)
+		return false;
 	return gnScreenWidth != GetOutputSurface()->w || gnScreenHeight != GetOutputSurface()->h;
 #else // SDL2, scaling handled by renderer.
 	return false;