Fixed Custom MessageBox regression that would freeze the Trade Manage…

…ment dialog.
PaulSquires · Feb 27, 2024 · 556b259 · 556b259
1 parent 799fa9b
commit 556b259
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/TradeTracker/src/Config/Config.h b/TradeTracker/src/Config/Config.h
@@ -30,7 +30,7 @@ SOFTWARE.
 #include "Utilities/AfxWin.h"
 
 
-constexpr std::wstring version = L"4.0.1";
+constexpr std::wstring version = L"4.0.2";
 
 enum class NumberFormatType {
     American,

diff --git a/TradeTracker/src/CustomMessageBox/CustomMessageBox.cpp b/TradeTracker/src/CustomMessageBox/CustomMessageBox.cpp
@@ -38,8 +38,10 @@ CCustomMessageBox CustomMessageBox;
 // ========================================================================================
 void CCustomMessageBox::OnClose(HWND hwnd) {
 	EnableWindow(hParent, false);
-	MainWindow.BlurPanels(false);
-	EnableWindow(MainWindow.hWindow, true);
+	if (hParent == MainWindow.hWindow) {
+		MainWindow.BlurPanels(false);
+	}
+	EnableWindow(hParent, true);
 	DestroyWindow(hwnd);
 }
 
@@ -352,11 +354,13 @@ int CCustomMessageBox::Show(
 
 	hBackBrush = CreateSolidBrush(Color(back_color).ToCOLORREF());
 
-	MainWindow.BlurPanels(true);
+	if (hParent == MainWindow.hWindow) {
+		MainWindow.BlurPanels(true);
+	}
 
 	AfxCenterWindowMonitorAware(hwnd, hParent);  
 
-	EnableWindow(MainWindow.hWindow, false);
+	EnableWindow(hParent, false);
 
 
 	// Fix Windows 10 white flashing