* Fix guild lister recursion crash

DiscordMessenger · Feb 1, 2025 · 960b32d · 960b32d
1 parent 72179ed
commit 960b32d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/windows/GuildLister.cpp b/src/windows/GuildLister.cpp
@@ -584,7 +584,7 @@ LRESULT CALLBACK GuildLister::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARA
 		}
 		case WM_DESTROY:
 		{
-			DestroyWindow(pThis->m_scrollable_hwnd);
+			//DestroyWindow(pThis->m_scrollable_hwnd);
 			DestroyWindow(pThis->m_tooltip_hwnd);
 			DestroyWindow(pThis->m_more_btn_hwnd);
 			DestroyWindow(pThis->m_bar_btn_hwnd);

diff --git a/src/windows/ShellNotification.cpp b/src/windows/ShellNotification.cpp
@@ -12,7 +12,6 @@ ShellNotification* GetShellNotification() {
 
 ShellNotification::~ShellNotification()
 {
-	assert(!m_bInitialized);
 	Deinitialize();
 }
 

diff --git a/src/windows/WinUtils.cpp b/src/windows/WinUtils.cpp
@@ -1299,6 +1299,17 @@ HBITMAP ResizeWithBackgroundColor(HDC hdc, HBITMAP hBitmap, HBRUSH backgroundCol
 	return newBitmap;
 }
 
+#ifdef _MSC_VER
+#define UsedCompiler "MSVC"
+#else
+#define UsedCompiler "MinGW"
+#endif
+#ifdef UNICODE
+#define ActiveCharset "Unicode"
+#else
+#define ActiveCharset "ANSI"
+#endif
+
 // This function calls std::terminate() after showing a message box.
 extern "C" void Terminate(const char* message, ...)
 {
@@ -1313,13 +1324,7 @@ extern "C" void Terminate(const char* message, ...)
 		anotherBuffer,
 		sizeof anotherBuffer,
 		"A fatal error has occurred within Discord Messenger. Please report it to iProgramInCpp!\r\n"
-		"You are using the "
-#ifdef _MSC_VER
-		"MSVC"
-#else
-		"MinGW"
-#endif
-		" version.\r\n\r\n"
+		"You are using the " UsedCompiler "-" ActiveCharset " version.\r\n\r\n"
 		"Details about the error:\r\n\r\n"
 		"%s\r\n\r\n"
 		"Discord Messenger will now close.",
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ ShellNotification* GetShellNotification() { @@
     ShellNotification::~ShellNotification()
     {
-    	assert(!m_bInitialized);
     	Deinitialize();
     }
@@ Expand Down @@