From 25631ebe341ca209e3d4c2b0d2a23dca449e8df7 Mon Sep 17 00:00:00 2001
From: Sasha Szpakowski <slime73@gmail.com>
Date: Tue, 24 Dec 2024 17:13:12 -0400
Subject: [PATCH] Improve execution flow when there's an error in the error
 handler

---
 src/modules/love/boot.lua | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/modules/love/boot.lua b/src/modules/love/boot.lua
index adc7d4585..487d3d23b 100644
--- a/src/modules/love/boot.lua
+++ b/src/modules/love/boot.lua
@@ -454,9 +454,12 @@ return function()
 		local handler = (not inerror and errhand) or error_printer
 		inerror = true
 		func = handler(...)
+		inerror = false
 	end
 
 	local function earlyinit()
+		func = nil
+
 		-- If love.boot fails, return 1 and finish immediately
 		local result = xpcall(love.boot, error_printer)
 		if not result then return 1 end
@@ -472,6 +475,8 @@ return function()
 		result, main = xpcall(love.run, deferErrhand)
 		if result then
 			func = main
+		elseif inerror then -- Error in error handler
+			print("Error: " .. tostring(main))
 		end
 	end