Patedam/Juliet
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DestroyPlatformWindow crashing when called in Shutdown of the application

Browse Source
This commit is contained in:
Patedam
2025-01-08 20:22:42 -05:00
parent 14e49c163f
commit 5b4b6f2c52
2 changed files with 11 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Juliet/src/Core/HAL/Display/Display.cpp
View File

@@ -53,7 +53,10 @@ namespace Juliet
}
// Destroy all Windows that are still alive
DestroyPlatformWindow(CurrentDisplayDevice->MainWindow);
if (CurrentDisplayDevice->MainWindow)
{
DestroyPlatformWindow(CurrentDisplayDevice->MainWindow);
}
CurrentDisplayDevice->Shutdown(CurrentDisplayDevice);
// Free anything that was freed by the shutdown and then free the display
@@ -89,11 +92,14 @@ namespace Juliet
void DestroyPlatformWindow(NonNullPtr<Window> window)
{
Assert(CurrentDisplayDevice->MainWindow == window.Get());
HideWindow(window);
CurrentDisplayDevice->DestroyPlatformWindow(CurrentDisplayDevice, window);
Free(window.Get());
CurrentDisplayDevice->MainWindow = nullptr;
}
void ShowWindow(NonNullPtr<Window> window)