mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-26 15:39:51 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'isapphung-postfix' into 'master'

Browse Source 
Simplify getIsHungAppWindow

See merge request OpenMW/openmw!2136
This commit is contained in:
jvoisin 2022-07-14 20:39:08 +00:00
commit 8da668e220
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/crashcatcher/windows_crashmonitor.cpp
View File

@ -24,21 +24,14 @@ namespace Crash
// See: https://docs.microsoft.com/en-us/windows/win32/api/winuser/nf-winuser-ishungappwindow
static IsHungAppWindowFn getIsHungAppWindow() noexcept
{
static IsHungAppWindowFn isHungAppWindow = nullptr;
static bool isHungAppWindowInitialized = false;
if (isHungAppWindowInitialized)
return isHungAppWindow;
auto user32Handle = LoadLibraryA("user32.dll");
if (user32Handle == nullptr)
return nullptr;
isHungAppWindow = reinterpret_cast<IsHungAppWindowFn>(GetProcAddress(user32Handle, "IsHungAppWindow"));
isHungAppWindowInitialized = true;
return isHungAppWindow;
return reinterpret_cast<IsHungAppWindowFn>(GetProcAddress(user32Handle, "IsHungAppWindow"));
}
static const IsHungAppWindowFn sIsHungAppWindow = getIsHungAppWindow();
CrashMonitor::CrashMonitor(HANDLE shmHandle)
: mShmHandle(shmHandle)
@ -145,8 +138,8 @@ namespace Crash
else
return false;
}
if (auto isHungAppWindow = getIsHungAppWindow(); isHungAppWindow != nullptr)
return isHungAppWindow(mAppWindowHandle);
if (sIsHungAppWindow != nullptr)
return sIsHungAppWindow(mAppWindowHandle);
else
{
BOOL debuggerPresent;