Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-17 18:59:21 +01:00
Code Releases Wiki Activity

impr: Implement basic exception catching in main thread

Browse Source
This commit is contained in:
WerWolv 2024-02-18 02:12:57 +01:00
parent 61b164a183
commit ed292a1e7a
2 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libimhex/include/hex/api/event_manager.hpp
View File

@ -72,7 +72,11 @@ namespace hex {
explicit Event(Callback func) noexcept : m_func(std::move(func)) { }
void operator()(Params... params) const noexcept {
m_func(params...);
try {
m_func(params...);
} catch (const std::exception &e) {
log::error("An exception occurred while handling event: {}", e.what());
}
}
private:
@ -173,11 +177,7 @@ namespace hex {
for (const auto &[id, event] : getEvents()) {
if (id == E::Id) {
try {
(*static_cast<E *const>(event.get()))(std::forward<decltype(args)>(args)...);
} catch (const std::exception &e) {
log::error("Event '{}' threw {}: {}", wolv::type::getTypeName<decltype(e)>(), wolv::type::getTypeName<E>(), e.what());
}
(*static_cast<E *const>(event.get()))(std::forward<decltype(args)>(args)...);
}
}

69
main/gui/source/window/window.cpp
View File

@ -37,6 +37,7 @@
#include <GLFW/glfw3.h>
#include <hex/ui/toast.hpp>
#include <wolv/utils/guards.hpp>
#include <fmt/printf.h>
namespace hex {
@ -119,23 +120,39 @@ namespace hex {
});
}
void Window::fullFrame() {
m_lastStartFrameTime = glfwGetTime();
glfwPollEvents();
static ImVec2 lastWindowSize = ImHexApi::System::getMainWindowSize();
if (ImHexApi::System::impl::isWindowResizable()) {
glfwSetWindowSizeLimits(m_window, 480_scaled, 360_scaled, GLFW_DONT_CARE, GLFW_DONT_CARE);
lastWindowSize = ImHexApi::System::getMainWindowSize();
} else {
glfwSetWindowSizeLimits(m_window, lastWindowSize.x, lastWindowSize.y, lastWindowSize.x, lastWindowSize.y);
void handleException() {
try {
throw;
} catch (const std::exception &e) {
log::fatal("Unhandled exception: {}", e.what());
} catch (...) {
log::fatal("Unhandled exception: Unknown exception");
}
}
// Render frame
this->frameBegin();
this->frame();
this->frameEnd();
void errorRecoverLogCallback(void*, const char* fmt, ...) {
va_list args;
va_start(args, fmt);
std::string message;
message.resize(std::vsnprintf(nullptr, 0, fmt, args));
std::vsnprintf(message.data(), message.size(), fmt, args);
message.resize(message.size() - 1);
va_end(args);
log::error("{}", message);
}
void Window::fullFrame() {
try {
this->frameBegin();
this->frame();
this->frameEnd();
} catch (...) {
ImGui::ErrorCheckEndFrameRecover(errorRecoverLogCallback, nullptr);
handleException();
}
}
void Window::loop() {
@ -174,9 +191,21 @@ namespace hex {
const double timeout = std::max(0.0, (1.0 / LongSleepFPS) - (glfwGetTime() - m_lastStartFrameTime));
glfwWaitEventsTimeout(timeout);
} else {
glfwPollEvents();
}
}
m_lastStartFrameTime = glfwGetTime();
static ImVec2 lastWindowSize = ImHexApi::System::getMainWindowSize();
if (ImHexApi::System::impl::isWindowResizable()) {
glfwSetWindowSizeLimits(m_window, 480_scaled, 360_scaled, GLFW_DONT_CARE, GLFW_DONT_CARE);
lastWindowSize = ImHexApi::System::getMainWindowSize();
} else {
glfwSetWindowSizeLimits(m_window, lastWindowSize.x, lastWindowSize.y, lastWindowSize.x, lastWindowSize.y);
}
this->fullFrame();
ImHexApi::System::impl::setLastFrameTime(glfwGetTime() - m_lastStartFrameTime);
@ -531,6 +560,8 @@ namespace hex {
this->endNativeWindowFrame();
ImGui::ErrorCheckEndFrameRecover(errorRecoverLogCallback, nullptr);
// Finalize ImGui frame
ImGui::Render();
@ -697,9 +728,7 @@ namespace hex {
auto win = static_cast<Window *>(glfwGetWindowUserPointer(window));
win->m_unlockFrameRate = true;
win->frameBegin();
win->frame();
win->frameEnd();
win->fullFrame();
});
// Register window resize callback
@ -712,9 +741,7 @@ namespace hex {
auto win = static_cast<Window *>(glfwGetWindowUserPointer(window));
win->m_unlockFrameRate = true;
win->frameBegin();
win->frame();
win->frameEnd();
win->fullFrame();
});
glfwSetCursorPosCallback(m_window, [](GLFWwindow *window, double, double) {