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

Fixed dx11 fullscreen crash. Fixed imgui tables crash.

Browse Source
This commit is contained in:
PixieCore 2021-08-13 15:39:59 +02:00 committed by GitHub
commit 232feeea31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
r5dev/src/CCompanion.cpp
View File

@ -213,7 +213,7 @@ void CCompanion::ServerBrowserSection()
const float FooterHeight = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing();
ImGui::BeginChild("ServerListChild", { 0, -FooterHeight }, true, ImGuiWindowFlags_AlwaysVerticalScrollbar);
{
ImGui::BeginTable("##ServerBrowser_ServerList", 4, ImGuiTableFlags_Resizable);
if (ImGui::BeginTable("##ServerBrowser_ServerList", 4, ImGuiTableFlags_Resizable))
{
ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthStretch, 35);
ImGui::TableSetupColumn("Map", ImGuiTableColumnFlags_WidthStretch, 25);
@ -251,8 +251,8 @@ void CCompanion::ServerBrowserSection()
}
}
}
ImGui::EndTable();
}
ImGui::EndTable();
}
ImGui::EndChild();

6
r5dev/src/id3dx.cpp
View File

@ -484,14 +484,14 @@ void InstallDXHooks()
///////////////////////////////////////////////////////////////////////////////
// Hook SwapChain
MH_CreateHook(g_fnIDXGISwapChainPresent, &Present, reinterpret_cast<void**>(&originalPresent));
MH_CreateHook(g_oResizeBuffers, &GetResizeBuffers, reinterpret_cast<void**>(&originalResizeBuffers));
// MH_CreateHook(g_oResizeBuffers, &GetResizeBuffers, reinterpret_cast<void**>(&originalResizeBuffers));
///////////////////////////////////////////////////////////////////////////////
// Enable hooks
MH_EnableHook(PostMessageA);
MH_EnableHook(PostMessageW);
MH_EnableHook(g_fnIDXGISwapChainPresent);
MH_EnableHook(g_oResizeBuffers);
// MH_EnableHook(g_oResizeBuffers);
}
void RemoveDXHooks()
@ -512,7 +512,7 @@ void RemoveDXHooks()
///////////////////////////////////////////////////////////////////////////////
// Unhook SwapChain
MH_RemoveHook(g_fnIDXGISwapChainPresent);
MH_RemoveHook(g_oResizeBuffers);
// MH_RemoveHook(g_oResizeBuffers);
///////////////////////////////////////////////////////////////////////////////
// Shutdown ImGui