From b090092d7376234e6fa2006bff16f411fd64b555 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 18 Sep 2015 22:27:46 +0200 Subject: [PATCH] Don't apply renderdoc hooks to renderdoc.dll. Things go... badly --- renderdoc/os/win32/win32_hook.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/renderdoc/os/win32/win32_hook.cpp b/renderdoc/os/win32/win32_hook.cpp index 8e9e85159..261eb3e81 100644 --- a/renderdoc/os/win32/win32_hook.cpp +++ b/renderdoc/os/win32/win32_hook.cpp @@ -125,8 +125,12 @@ struct CachedHookData // instead, skip modifying the import descriptors, it will hook the 'real' d3d functions // and we can call them and have fraps + renderdoc playing nicely together. // we also exclude some other overlay renderers here, such as steam's + // + // Also we exclude ourselves here - just in case the application has already loaded + // renderdoc.dll, or tries to load it. if(strstr(lowername, "fraps") || - strstr(lowername, "gameoverlayrenderer")) + strstr(lowername, "gameoverlayrenderer") || + strstr(lowername, "renderdoc")) return; // for safety (and because we don't need to), ignore these modules