2 files changed, 23 insertions, 19 deletions
diff --git a/platform/windows/crash_handler_win.cpp b/platform/windows/crash_handler_win.cpp
index c9385f36d6..2f5ee7956e 100644
--- a/platform/windows/crash_handler_win.cpp
+++ b/platform/windows/crash_handler_win.cpp
@@ -116,7 +116,7 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) {
 	DWORD cbNeeded;
 	std::vector<HMODULE> module_handles(1);
 
-	if (OS::get_singleton() == NULL || OS::get_singleton()->is_disable_crash_handler()) {
+	if (OS::get_singleton() == NULL || OS::get_singleton()->is_disable_crash_handler() || IsDebuggerPresent()) {
 		return EXCEPTION_CONTINUE_SEARCH;
 	}
 
@@ -159,7 +159,7 @@ DWORD CrashHandlerException(EXCEPTION_POINTERS *ep) {
 	IMAGE_NT_HEADERS *h = ImageNtHeader(base);
 	DWORD image_type = h->FileHeader.Machine;
 	int n = 0;
-	String msg = GLOBAL_GET("debug/settings/backtrace/message");
+	String msg = GLOBAL_GET("debug/settings/crash_handler/message");
 
 	fprintf(stderr, "Dumping the backtrace. %ls\n", msg.c_str());
 
diff --git a/platform/windows/godot_win.cpp b/platform/windows/godot_win.cpp
index 4450cb3670..cff2cbad42 100644
--- a/platform/windows/godot_win.cpp
+++ b/platform/windows/godot_win.cpp
@@ -156,32 +156,36 @@ int widechar_main(int argc, wchar_t **argv) {
 	return os.get_exit_code();
 };
 
-int main(int _argc, char **_argv) {
-// _argc and _argv are ignored
-// we are going to use the WideChar version of them instead
+int _main() {
+	LPWSTR *wc_argv;
+	int argc;
+	int result;
 
-#ifdef CRASH_HANDLER_EXCEPTION
-	__try {
-#endif
-		LPWSTR *wc_argv;
-		int argc;
-		int result;
+	wc_argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+
+	if (NULL == wc_argv) {
+		wprintf(L"CommandLineToArgvW failed\n");
+		return 0;
+	}
 
-		wc_argv = CommandLineToArgvW(GetCommandLineW(), &argc);
+	result = widechar_main(argc, wc_argv);
 
-		if (NULL == wc_argv) {
-			wprintf(L"CommandLineToArgvW failed\n");
-			return 0;
-		}
+	LocalFree(wc_argv);
+	return result;
+}
 
-		result = widechar_main(argc, wc_argv);
+int main(int _argc, char **_argv) {
+// _argc and _argv are ignored
+// we are going to use the WideChar version of them instead
 
-		LocalFree(wc_argv);
-		return result;
 #ifdef CRASH_HANDLER_EXCEPTION
+	__try {
+		return _main();
 	} __except (CrashHandlerException(GetExceptionInformation())) {
 		return 1;
 	}
+#else
+	return _main();
 #endif
 }