diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
index c7a5eab19a5..8965ba773c5 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CThread.java
@@ -727,12 +727,14 @@ public class CThread extends CDebugElement implements ICThread, IRestart, IResum
 		}
 		else {
 			disposeStackFrames();
-			fireChangeEvent( DebugEvent.CONTENT );
 		}
 		setCurrent( false );
 		setState( state );
 		setCurrentStateInfo( null );
-		fireResumeEvent( detail );
+		DebugEvent events[] = new DebugEvent[2];
+		events[0] = createChangeEvent( DebugEvent.CONTENT );
+		events[1] = createResumeEvent( detail );
+		fireEventSet(events);
 	}
 
 	private void handleEndSteppingRange( ICDIEndSteppingRange endSteppingRange ) {