From 2dad602c0d00ac98f428ce3090575d4fab3bac5e Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Tue, 21 May 2024 13:45:57 -0700
Subject: [PATCH] ThreadPool: Crash fixes

---
 src/lime/system/ThreadPool.hx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/lime/system/ThreadPool.hx b/src/lime/system/ThreadPool.hx
index abb35f683..1999920eb 100644
--- a/src/lime/system/ThreadPool.hx
+++ b/src/lime/system/ThreadPool.hx
@@ -183,7 +183,14 @@ class ThreadPool extends WorkOutput
 	{
 		super(mode);
 
-		__workPerFrame = workLoad / Application.current.window.frameRate;
+		if (Application.current != null && Application.current.window != null)
+		{
+			__workPerFrame = workLoad / Application.current.window.frameRate;
+		}
+		else
+		{
+			__workPerFrame = workLoad / 60;
+		}
 
 		this.minThreads = minThreads;
 		this.maxThreads = maxThreads;
@@ -335,7 +342,7 @@ class ThreadPool extends WorkOutput
 		completed = false;
 		canceled = false;
 
-		if (!Application.current.onUpdate.has(__update))
+		if (Application.current != null && !Application.current.onUpdate.has(__update))
 		{
 			Application.current.onUpdate.add(__update);
 		}
@@ -570,7 +577,7 @@ class ThreadPool extends WorkOutput
 			activeJob = null;
 		}
 
-		if (completed)
+		if (completed && Application.current != null)
 		{
 			Application.current.onUpdate.remove(__update);
 		}