Applied patch [ 774886 ] wxnotebook bug

[wxWidgets.git] / src / msw / crashrpt.cpp

diff --git a/src/msw/crashrpt.cpp b/src/msw/crashrpt.cpp
index 7098089b5e8097f66b8ff84e4251e499eaa196e6..eaccaeafce071e502f1658973620e4d655164212 100644 (file)
--- a/src/msw/crashrpt.cpp
+++ b/src/msw/crashrpt.cpp
@@ -1020,7 +1020,7 @@ bool wxCrashReportImpl::Generate(int flags)
     {
         if ( ResolveSymFunctions(dllDbgHelp) )
         {
     {
         if ( ResolveSymFunctions(dllDbgHelp) )
         {

-            SymSetOptions(SYMOPT_DEFERRED_LOADS);
+            SymSetOptions(SYMOPT_DEFERRED_LOADS | SYMOPT_UNDNAME);

 
             // Initialize DbgHelp
             if ( SymInitialize(GetCurrentProcess(), NULL, TRUE /* invade */) )
 
             // Initialize DbgHelp
             if ( SymInitialize(GetCurrentProcess(), NULL, TRUE /* invade */) )


@@ -1132,7 +1132,16 @@ extern unsigned long wxGlobalSEHandler(EXCEPTION_POINTERS *pExcPtrs)
         wxGlobalSEInformation = pExcPtrs;
 
         // give the user a chance to do something special about this
         wxGlobalSEInformation = pExcPtrs;
 
         // give the user a chance to do something special about this

-        wxTheApp->OnFatalException();
+        __try
+        {
+            wxTheApp->OnFatalException();
+        }
+        __except ( EXCEPTION_EXECUTE_HANDLER )
+        {
+            // nothing to do here, just ignore the exception inside the
+            // exception handler
+            ;
+        }

 
         wxGlobalSEInformation = NULL;
 
 
         wxGlobalSEInformation = NULL;