fixes microsoft#71671

isidorn · isidorn · commit f8dfbfa457d5 · 2019-04-05T14:59:52.000+02:00
diff --git a/src/vs/workbench/contrib/debug/common/debugModel.ts b/src/vs/workbench/contrib/debug/common/debugModel.ts
@@ -797,7 +797,7 @@ export class DebugModel implements IDebugModel {
 				// Make sure to de-dupe if a session is re-intialized. In case of EH debugging we are adding a session again after an attach.
 				return false;
 			}
-			if (s.state === State.Inactive && s.getLabel() === session.getLabel()) {
+			if (s.state === State.Inactive && s.configuration.name === session.configuration.name) {
 				// Make sure to remove all inactive sessions that are using the same configuration as the new session
 				return false;
 			}
diff --git a/src/vs/workbench/contrib/debug/electron-browser/debugSession.ts b/src/vs/workbench/contrib/debug/electron-browser/debugSession.ts
@@ -783,6 +783,7 @@ export class DebugSession implements IDebugSession {
 		}));
 
 		this.rawListeners.push(this.raw.onDidExitAdapter(event => {
+			this.initialized = true;
 			this._onDidEndAdapter.fire(event);
 		}));
 	}

Original file line number	Diff line number	Diff line change
`@@ -797,7 +797,7 @@ export class DebugModel implements IDebugModel {`
`797`	`797`	`// Make sure to de-dupe if a session is re-intialized. In case of EH debugging we are adding a session again after an attach.`
`798`	`798`	`return false;`
`799`	`799`	`}`
`800`		`- if (s.state === State.Inactive && s.getLabel() === session.getLabel()) {`
	`800`	`+ if (s.state === State.Inactive && s.configuration.name === session.configuration.name) {`
`801`	`801`	`// Make sure to remove all inactive sessions that are using the same configuration as the new session`
`802`	`802`	`return false;`
`803`	`803`	`}`
Original file line number	Diff line number	Diff line change
`@@ -783,6 +783,7 @@ export class DebugSession implements IDebugSession {`
`783`	`783`	`}));`
`784`	`784`
`785`	`785`	`this.rawListeners.push(this.raw.onDidExitAdapter(event => {`
	`786`	`+ this.initialized = true;`
`786`	`787`	`this._onDidEndAdapter.fire(event);`
`787`	`788`	`}));`
`788`	`789`	`}`