mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-23 01:42:19 -05:00
Code Issues Projects Releases Wiki Activity

boxes (#1428)

Browse Source
This commit is contained in:
louist103 2022-09-08 19:05:16 -04:00 committed by GitHub
parent 3b844375b7
commit 4d81c28738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libultraship/libultraship/CrashHandler.cpp
View File

@ -12,6 +12,7 @@ extern "C" void DeinitOTR(void);
#include <dlfcn.h> // for dladdr #include <dlfcn.h> // for dladdr
#include <execinfo.h> #include <execinfo.h>
#include <unistd.h> #include <unistd.h>
#include <SDL.h>
@ -135,9 +136,11 @@ static void ErrorHandler(int sig, siginfo_t* sigInfo, void* data) {
SPDLOG_CRITICAL("{} {}", i, functionName.c_str()); SPDLOG_CRITICAL("{} {}", i, functionName.c_str());
} }
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "SoH has crashed", "SoH Has crashed. Please upload the logs to the support channel in discord.", nullptr);
free(symbols); free(symbols);
DeinitOTR(); DeinitOTR();
Ship::Window::GetInstance()->GetLogger()->flush();
spdlog::shutdown();
exit(1); exit(1);
} }

5
libultraship/libultraship/Window.cpp
View File

@ -540,13 +540,12 @@ namespace Ship {
if (!ResMan->DidLoadSuccessfully()) if (!ResMan->DidLoadSuccessfully())
{ {
#ifdef _WIN32 #if defined(__SWITCH__)
MessageBox(nullptr, L"Main OTR file not found!", L"Uh oh", MB_OK);
#elif defined(__SWITCH__)
printf("Main OTR file not found!\n"); printf("Main OTR file not found!\n");
#elif defined(__WIIU__) #elif defined(__WIIU__)
Ship::WiiU::ThrowMissingOTR(MainPath.c_str()); Ship::WiiU::ThrowMissingOTR(MainPath.c_str());
#else #else
SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, "OTR file not found", "Main OTR file not found. Please generate one", nullptr);
SPDLOG_ERROR("Main OTR file not found!"); SPDLOG_ERROR("Main OTR file not found!");
#endif #endif
exit(1); exit(1);