Fix #50 - shutdown correctly when requested, with 'restart': true

microsoft · Oct 26, 2016 · 727f1e6 · 727f1e6
1 parent f388b01
commit 727f1e6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/src/chrome/chromeDebugAdapter.ts b/src/chrome/chromeDebugAdapter.ts
@@ -209,11 +209,9 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter {
         this._smartStep = args.smartStep;
     }
 
-    /**
-     * From DebugSession
-     */
     public shutdown(): void {
         this._inShutdown = true;
+        this._session.shutdown();
     }
 
     /**
@@ -461,6 +459,7 @@ export abstract class ChromeDebugAdapter implements IDebugAdapter {
     }
 
     public disconnect(): void {
+        this.shutdown();
         return this.terminateSession('Got disconnect request');
     }
 

diff --git a/src/chrome/chromeDebugSession.ts b/src/chrome/chromeDebugSession.ts
@@ -99,11 +99,6 @@ export class ChromeDebugSession extends DebugSession {
         super.sendResponse(response);
     }
 
-    public shutdown(): void {
-        this._debugAdapter.shutdown();
-        super.shutdown();
-    }
-
     private onLog(msg: string, level: logger.LogLevel): void {
         const outputCategory = level === logger.LogLevel.Error ? 'stderr' : 'stdout';