X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugTarget.java b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugTarget.java
index 9b7b206..ee034ec 100644
--- a/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugTarget.java
+++ b/net.sourceforge.phpeclipse.xdebug.core/src/net/sourceforge/phpeclipse/xdebug/php/model/XDebugTarget.java
@@ -177,7 +177,7 @@ public class XDebugTarget extends XDebugElement implements IDebugTarget, IDebugE
 			fSuspended = false;
 			
 			XDebugCorePlugin.getBreakpointManager().removeBreakpointListener(this);
-			fireTerminateEvent();
+			fThread.fireTerminateEvent();
 			DebugPlugin.getDefault().removeDebugEventListener(this);
 			/*if (fThread!=null)
 				fThread.removeEventListeners();*/
@@ -557,9 +557,9 @@ public class XDebugTarget extends XDebugElement implements IDebugTarget, IDebugE
 		stopListener();
 		fDebugConnection.close();
 
-		fThread.removeEventListeners();
+/*		fThread.removeEventListeners();
 		fThread = null;
-		fThreads = new IThread[0];
+		fThreads = new IThread[0];*/
 		
 /*		stopListener();
 		fDebugConnection.close();*/
@@ -575,18 +575,23 @@ public class XDebugTarget extends XDebugElement implements IDebugTarget, IDebugE
 			}
 		} else {
 			fDebugConnection = null;
-			fireEvent(new DebugEvent(this, DebugEvent.CHANGE, DebugEvent.CONTENT));
-		}		
+			fThread.fireEvent(new DebugEvent(this, DebugEvent.CHANGE, DebugEvent.CONTENT));
+		}
+		
+		fThread.removeEventListeners();
+		fThread = null;
+		fThreads = new IThread[0];
 	}
 	
 	public void handleProxyEvent(/*String ideKey,*/ XDebugConnection connection) {
 		setDebugConnection(connection);
 		System.out.println("* New Connection - XDebug.Target: " + fDebugConnection.getSessionID());
 		
-		fireEvent(new DebugEvent(this, DebugEvent.CHANGE, DebugEvent.CHANGE));
+//		fireEvent(new DebugEvent(this, DebugEvent.CHANGE, DebugEvent.CHANGE));
 		
 		fThread = new XDebugThread(this);
 		fThreads = new IThread[] {fThread};
+		fThread.fireEvent(new DebugEvent(this, DebugEvent.CHANGE, DebugEvent.CHANGE));
 		try {
 			started();
 		} catch( DebugException e ){