Re-organise disconnected state

Signed-off-by: worksofliam <[email protected]>
codefori · Dec 3, 2024 · a69402b · a69402b
1 parent d6dd187
commit a69402b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/api/IBMi.ts b/src/api/IBMi.ts
@@ -1240,6 +1240,8 @@ export default class IBMi {
       this.client.connection?.removeAllListeners();
       this.client.dispose();
       this.client.connection = null;
+
+      instance.fire(`disconnected`);
     }
   }
 
@@ -1254,8 +1256,6 @@ export default class IBMi {
     if (this.outputChannelContent !== undefined) {
       this.outputChannelContent = undefined;
     }
-
-    instance.fire(`disconnected`);
   }
 
   /**

diff --git a/src/api/Instance.ts b/src/api/Instance.ts
@@ -54,7 +54,7 @@ export default class Instance {
           });
         }
 
-        await conn.dispose();
+        this.setConnection();
 
         if (reconnect) {
           await this.connect({...options, reconnecting: true});
@@ -75,7 +75,7 @@ export default class Instance {
           break;
 
         } else {
-          await this.setConnection();
+          await this.disconnect();
           if (options.reconnecting && await vscode.window.showWarningMessage(`Could not reconnect`, {
             modal: true,
             detail: `Reconnection has failed. Would you like to try again?\n\n${result.error || `No error provided.`}`
@@ -110,11 +110,11 @@ export default class Instance {
   }
 
   private async setConnection(connection?: IBMi) {
-    if (connection) {
-      if (this.connection) {
-        await this.connection.dispose();
-      }
+    if (this.connection) {
+      await this.connection.dispose();
+    }
 
+    if (connection) {
       this.connection = connection;
       this.storage.setConnectionName(connection.currentConnectionName);
       await GlobalStorage.get().setLastConnection(connection.currentConnectionName);