From 8a46853dfd999e7a5806d37e0a36285438427a8b Mon Sep 17 00:00:00 2001
From: Flyinghead <raphael.jean@gmail.com>
Date: Mon, 2 Aug 2021 12:07:40 +0200
Subject: [PATCH] lr: deadlock on exit with custom textures (win32)

less log
---
 core/emulator.cpp            | 1 +
 core/windows/unwind_info.cpp | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/emulator.cpp b/core/emulator.cpp
index 0d600b3fe..11fee2473 100644
--- a/core/emulator.cpp
+++ b/core/emulator.cpp
@@ -585,6 +585,7 @@ void dc_term_emulator()
 	sh4_cpu.Term();
 	if (settings.platform.system != DC_PLATFORM_DREAMCAST)
 		naomi_cart_Close();
+	custom_texture.Terminate();	// lr: avoid deadlock on exit (win32)
 	devicesTerm();
 	mem_Term();
 	_vmem_release();
diff --git a/core/windows/unwind_info.cpp b/core/windows/unwind_info.cpp
index 46b7100f5..db60bdf4f 100644
--- a/core/windows/unwind_info.cpp
+++ b/core/windows/unwind_info.cpp
@@ -82,14 +82,14 @@ size_t UnwindInfo::end(u32 offset, ptrdiff_t rwRxOffset)
 #endif
 	bool result = RtlAddFunctionTable(table, 1, (DWORD64)startAddr);
 	tables.push_back(table);
-	NOTICE_LOG(DYNAREC, "RtlAddFunctionTable %p sz %d rc %d tables: %d", startAddr, table[0].EndAddress, result, (u32)tables.size());
+	DEBUG_LOG(DYNAREC, "RtlAddFunctionTable %p sz %d rc %d tables: %d", startAddr, table[0].EndAddress, result, (u32)tables.size());
 
 	return (unwindInfo + codes.size() * sizeof(u16) + sizeof(RUNTIME_FUNCTION)) - endAddr;
 }
 
 void UnwindInfo::clear()
 {
-	NOTICE_LOG(DYNAREC, "UnwindInfo::clear");
+	DEBUG_LOG(DYNAREC, "UnwindInfo::clear");
 	for (RUNTIME_FUNCTION *table : tables)
 		RtlDeleteFunctionTable(table);
 	tables.clear();