From ae3115502c07e25c56878b297ae879b95ed20f12 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 2 Mar 2011 13:42:45 +0100
Subject: [PATCH] Debugger[CDB]: Suppress WOW86 exceptions while stepping.

---
 src/plugins/debugger/cdb/cdbengine.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 1aba5dc68cd..9c0a27bb6b2 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -1779,9 +1779,10 @@ unsigned CdbEngine::examineStopReason(const GdbMi &stopReason,
         exception.fromGdbMI(stopReason);
         QString description = exception.toString();
 #ifdef Q_OS_WIN
-        // It is possible to hit on a startup trap while stepping (if something
+        // It is possible to hit on a startup trap or WOW86 exception while stepping (if something
         // pulls DLLs. Avoid showing a 'stopped' Message box.
-        if (exception.exceptionCode == winExceptionStartupCompleteTrap)
+        if (exception.exceptionCode == winExceptionStartupCompleteTrap
+            || exception.exceptionCode == winExceptionWX86Breakpoint)
             return StopNotifyStop;
         if (exception.exceptionCode == winExceptionCtrlPressed) {
             // Detect interruption by pressing Ctrl in a console and force a switch to thread 0.