From 0ebbc721e553926aeb5b7f952edf16c12014d51e Mon Sep 17 00:00:00 2001
From: Rich Chiodo <rchiodo@microsoft.com>
Date: Fri, 20 Dec 2019 07:15:08 -0800
Subject: [PATCH] Make sure to leave the loop if switching works.

---
 .../datascience/interactive-common/interactiveBase.ts      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/client/datascience/interactive-common/interactiveBase.ts b/src/client/datascience/interactive-common/interactiveBase.ts
index 68a15483a88f..6d2d69a8d009 100644
--- a/src/client/datascience/interactive-common/interactiveBase.ts
+++ b/src/client/datascience/interactive-common/interactiveBase.ts
@@ -1322,10 +1322,10 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
             await this.switchKernelWithRetry(kernel);
         }
     }
-    private async switchKernelWithRetry(kernel: KernelSpecInterpreter){
+    private async switchKernelWithRetry(kernel: KernelSpecInterpreter) {
         const settings = this.configuration.getSettings();
         const isLocalConnection = this.notebook?.server.getConnectionInfo()?.localLaunch ?? settings.datascience.jupyterServerURI.toLowerCase() === Settings.JupyterServerLocalLaunch;
-        if (!isLocalConnection){
+        if (!isLocalConnection) {
             return this.switchKernel(kernel);
         }
 
@@ -1336,6 +1336,7 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
         while (true) {
             try {
                 await this.switchKernel(kernel);
+                break;
             } catch (ex) {
                 if (ex instanceof JupyterSessionStartError && isLocalConnection) {
                     // Looks like we were unable to start a session for the local connection.
@@ -1348,7 +1349,7 @@ export abstract class InteractiveBase extends WebViewHost<IInteractiveWindowMapp
                     const selection = await this.applicationShell.showErrorMessage(message, selectKernel, cancel);
                     if (selection === selectKernel) {
                         kernel = await this.dataScience.selectLocalJupyterKernel(kernel.kernelSpec || kernel.kernelModel);
-                        if (Object.keys(kernel).length > 0){
+                        if (Object.keys(kernel).length > 0) {
                             continue;
                         }
                     }