R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix Dear ImGui shutdown assert

Browse Source
This commit is contained in:
Kawe Mazidjatari 2022-05-07 17:13:37 +02:00
parent 45de72ea78
commit 116d66f241
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
r5dev/windows/id3dx.cpp
View File

@ -32,6 +32,7 @@ typedef BOOL(WINAPI* IPostMessageW)(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM l
static BOOL g_bInitMenu = false;
static BOOL g_bInitialized = false;
static BOOL g_bPresentHooked = false;
static BOOL g_bImGuiInitialized = false;
///////////////////////////////////////////////////////////////////////////////////
static WNDPROC g_oWndProc = NULL;
@ -262,6 +263,8 @@ void SetupImGui()
///////////////////////////////////////////////////////////////////////////////
ImGuiIO& io = ImGui::GetIO(); (void)io;
io.ConfigFlags |= ImGuiConfigFlags_IsSRGB;
g_bImGuiInitialized = true;
}
void DrawImGui()
@ -521,8 +524,12 @@ void DirectX_Shutdown()
///////////////////////////////////////////////////////////////////////////////
// Shutdown ImGui
ImGui_ImplWin32_Shutdown();
ImGui_ImplDX11_Shutdown();
if (g_bImGuiInitialized)
{
ImGui_ImplWin32_Shutdown();
ImGui_ImplDX11_Shutdown();
g_bImGuiInitialized = false;
}
}
void HIDXGI::GetAdr(void) const