imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 21:05:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: Crash on Wayland when glfwTerminate() gets called more than once

Browse Source
This commit is contained in:
WerWolv
2025-06-28 13:48:48 +02:00
parent 2a8dd0873b
commit 288f8ee42f
2 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
main/gui/source/init/run/native.cpp
View File

@@ -11,6 +11,12 @@
namespace hex::init {
int runImHex() {
// Initialize GLFW
if (!glfwInit()) {
log::fatal("Failed to initialize GLFW!");
std::abort();
}
ON_SCOPE_EXIT { glfwTerminate(); };
bool shouldRestart = false;
do {
@@ -20,6 +26,7 @@
shouldRestart = true;
});
// Splash window
{
auto splashWindow = initializeImHex();
// Draw the splash window while tasks are running
@@ -29,19 +36,10 @@
handleFileOpenRequest();
}
// Main window
{
// Initialize GLFW
if (!glfwInit()) {
log::fatal("Failed to initialize GLFW!");
std::abort();
}
ON_SCOPE_EXIT { glfwTerminate(); };
// Main window
{
Window window;
window.loop();
}
Window window;
window.loop();
deinitializeImHex();
}