ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix nullptr problems (#878)

Browse source
This commit is contained in:
kizer 2022-06-04 20:45:22 +09:00 • committed by GitHub
parent 74966fc4ef
commit 71f3680388
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 161 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Dalamud.Boot/dllmain.cpp
View file

@ -16,7 +16,7 @@ DllExport DWORD WINAPI Initialize(LPVOID lpParam, HANDLE hMainThreadContinue) {
logging::print<logging::I>("No log file path given; not logging to file.");
else {
try {
logging::start_file_logging(logFilePath);
logging::start_file_logging(logFilePath, !bootconfig::is_show_console());
logging::print<logging::I>(L"Logging to file: {}", logFilePath);
} catch (const std::exception& e) {
logging::print<logging::E>(L"Couldn't open log file: {}", logFilePath);
@ -84,6 +84,13 @@ DllExport DWORD WINAPI Initialize(LPVOID lpParam, HANDLE hMainThreadContinue) {
if (bootconfig::wait_messagebox() & bootconfig::WaitMessageboxFlags::BeforeDalamudEntrypoint)
MessageBoxW(nullptr, L"Press OK to continue", L"Dalamud Boot", MB_OK);
if (hMainThreadContinue) {
// Let the game initialize.
SetEvent(hMainThreadContinue);
}
utils::wait_for_game_window();
logging::print<logging::I>("Initializing Dalamud...");
entrypoint_fn(lpParam, hMainThreadContinue);
logging::print<logging::I>("Done!");