2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d530ac1952..38756748d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun  4 21:53:56 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* win32/win32.c (rb_w32_sysinit): let the system not display the
+	  critical-error-handler message box and the Windows Error Reporting
+	  dialog.  [ruby-core:45389] [Bug #6535]
+
 Mon Jun  4 19:36:25 2012  Tanaka Akira  <akr@fsij.org>
 
 	* process.c (rb_exec_fillarg): allocate one more element before
diff --git a/win32/win32.c b/win32/win32.c
index d7166b646b..e5be0d94af 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -774,6 +774,8 @@ rb_w32_sysinit(int *argc, char ***argv)
     _set_invalid_parameter_handler(invalid_parameter);
     _RTC_SetErrorFunc(rtc_error_handler);
     set_pioinfo_extra();
+#else
+    SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
 #endif
 
     get_version();