Plugins: Defer hook creation

elbadcode · Feb 18, 2025 · b3f9542 · b3f9542
1 parent f86f90d
commit b3f9542
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/mods/PluginLoader.cpp b/src/mods/PluginLoader.cpp
@@ -97,15 +97,21 @@ int register_inline_hook(void* target, void* dst, void** original) {
         return -1;
     }
 
-    auto hook = safetyhook::create_inline(target, dst);
+    auto hook = safetyhook::create_inline(target, dst, safetyhook::InlineHook::StartDisabled);
 
     if (!hook) {
         spdlog::error("Failed to create inline hook at {:x}", (uintptr_t)target);
         return -1;
     }
 
+    // Plugin needs to be aware of this before enabling the hook.
     *original = hook.original<void*>();
 
+    if (auto enable_result = hook.enable(); !enable_result.has_value()) {
+        spdlog::error("Failed to enable inline hook at {:x}: {}", (uintptr_t)target, enable_result.error().type);
+        return -1;
+    }
+
     return PluginLoader::get()->add_inline_hook(std::move(hook));
 }