Make sure text part of combobox is enabled/disabled too

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

diff --git a/src/msw/stackwalk.cpp b/src/msw/stackwalk.cpp
index 5a12a002b79ed8ab458c3f0544f7f55111730684..0566e96ab82159e5fb0ac57d2d54ad3b1c48dbc3 100644 (file)
--- a/src/msw/stackwalk.cpp
+++ b/src/msw/stackwalk.cpp
@@ -134,9 +134,9 @@ void wxStackFrame::OnParam(PSYMBOL_INFO pSymInfo)
 
     // if symbol information is corrupted and we crash, the exception is going
     // to be ignored when we're called from WalkFromException() because of the
-    // except handler there returning EXCEPTION_CONTINUE_EXECUTION, but we'd be
-    // left in an inconsistent state, so deal with it explicitely here (even if
-    // normally we should never crash, of course...)
+    // exception handler there returning EXCEPTION_CONTINUE_EXECUTION, but we'd
+    // be left in an inconsistent state, so deal with it explicitly here (even
+    // if normally we should never crash, of course...)
 #ifdef _CPPUNWIND
     try
 #else
@@ -220,6 +220,7 @@ void wxStackWalker::WalkFrom(const CONTEXT *pCtx, size_t skip)
     {
         wxLogError(_("Failed to get stack backtrace:\n%s"),
                    wxDbgHelpDLL::GetErrorMessage().c_str());
+        return;
     }
 
     // according to MSDN, the first parameter should be just a unique value and