From 5e785ac6ede4901e7b849eb8c2d5b578d835e0eb Mon Sep 17 00:00:00 2001
From: Jakub Audykowicz <jakub.audykowicz@dolby.com>
Date: Fri, 8 Sep 2023 01:27:52 +0200
Subject: [PATCH] Android - Move std::rethrow_exception to GameThread

---
 .../Source/Private/Utils/DolbyIOErrorHandler.cpp   | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/DolbyIO/Source/Private/Utils/DolbyIOErrorHandler.cpp b/DolbyIO/Source/Private/Utils/DolbyIOErrorHandler.cpp
index 93b73001..428fb47f 100644
--- a/DolbyIO/Source/Private/Utils/DolbyIOErrorHandler.cpp
+++ b/DolbyIO/Source/Private/Utils/DolbyIOErrorHandler.cpp
@@ -26,6 +26,20 @@ namespace DolbyIO
 
 	void FErrorHandler::operator()(std::exception_ptr&& ExcPtr) const
 	{
+#if PLATFORM_ANDROID
+		return AsyncTask(ENamedThreads::GameThread,
+		                 [ExcP = MoveTemp(ExcPtr), CopySelf = *this]
+		                 {
+			                 try
+			                 {
+				                 std::rethrow_exception(ExcP);
+			                 }
+			                 catch (...)
+			                 {
+				                 CopySelf.HandleError();
+			                 }
+		                 });
+#endif
 		HandleError([ExcP = MoveTemp(ExcPtr)] { std::rethrow_exception(ExcP); });
 	}