diff --git a/Dalamud.Boot/dllmain.cpp b/Dalamud.Boot/dllmain.cpp index 608e7b84b..064878ed1 100644 --- a/Dalamud.Boot/dllmain.cpp +++ b/Dalamud.Boot/dllmain.cpp @@ -36,6 +36,20 @@ DllExport DWORD WINAPI Initialize(LPVOID lpParam) std::wstring runtimeconfig_path = _wcsdup(fs_module_path.replace_filename(L"Dalamud.runtimeconfig.json").c_str()); std::wstring module_path = _wcsdup(fs_module_path.replace_filename(L"Dalamud.dll").c_str()); + // ============================== VEH ======================================== // + + printf("Initializing VEH... "); + if(is_running_on_linux()) + { + printf("Failed! [Disabled for Wine]\n"); + } + else + { + if (veh::add_handler()) + printf("Done!\n"); + else printf("Failed!\n"); + } + // =========================================================================== // void* entrypoint_vfn; @@ -57,22 +71,6 @@ DllExport DWORD WINAPI Initialize(LPVOID lpParam) entrypoint_fn(lpParam); printf("Done!\n"); - // ============================== VEH ======================================== // - - printf("Initializing VEH... "); - if(is_running_on_linux()) - { - printf("Failed! [Disabled for Wine]\n"); - } - else - { - if (veh::add_handler()) - printf("Done!\n"); - else printf("Failed!\n"); - } - - // =========================================================================== // - #ifndef NDEBUG fclose(stdin); fclose(stdout); diff --git a/Dalamud/EntryPoint.cs b/Dalamud/EntryPoint.cs index 5caccb3a3..2a8f053d5 100644 --- a/Dalamud/EntryPoint.cs +++ b/Dalamud/EntryPoint.cs @@ -76,7 +76,7 @@ namespace Dalamud // This is due to GitHub not supporting TLS 1.0, so we enable all TLS versions globally ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls; - + if (!Util.IsLinux()) InitSymbolHandler(info);