From a04c178ed4b0aa21c4b08d00ad0af9ced9c1c45d Mon Sep 17 00:00:00 2001 From: Vulpovile Date: Mon, 3 Oct 2022 17:19:30 -0700 Subject: [PATCH] Made crash dialog not override AVE on debug --- Dialogs.rc | 2 ++ src/source/main.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/Dialogs.rc b/Dialogs.rc index 882bd1c..781658b 100644 --- a/Dialogs.rc +++ b/Dialogs.rc @@ -47,5 +47,7 @@ IDI_ICON1 ICON "FatB3dIcon.ico" // // Manifest resources // +#ifndef _DEBUG LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL 1 RT_MANIFEST ".\\Blocks3D.exe.manifest" +#endif \ No newline at end of file diff --git a/src/source/main.cpp b/src/source/main.cpp index 541355c..6eade86 100644 --- a/src/source/main.cpp +++ b/src/source/main.cpp @@ -148,7 +148,9 @@ LRESULT CALLBACK G3DProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) int main(int argc, char** argv) { +#ifndef _DEBUG try{ +#endif hresult = OleInitialize(NULL); /* IInternetSecurityManager *pSecurityMgr; @@ -214,10 +216,12 @@ int main(int argc, char** argv) { Globals::mainHwnd = hwndMain; Application app = Application(hwndMain); app.run(); +#ifndef _DEBUG } catch(...) { OnError(-1); } +#endif return 0; }