bugs gone!

Author: Jalileh

.vscode/launch.json

@@ -304,8 +304,13 @@ export class WaveBrowserWindow extends BaseWindow {
         // If the workspace is already owned by a window, then we can just call SwitchWorkspace without first prompting the user, since it'll just focus to the other window.
         const workspaceList = await WorkspaceService.ListWorkspaces();
         if (!workspaceList?.find((wse) => wse.workspaceid === workspaceId)?.windowid) {		
-            const curWorkspace = await WorkspaceService.GetWorkspace(this.workspaceId);  /* potential bug here, curWorkspace undefined after deleting previous workspace */
-			if (curWorkspace  && isNonEmptyUnsavedWorkspace(curWorkspace)) {
+            const curWorkspace = await WorkspaceService.GetWorkspace(this.workspaceId);  
+            if (curWorkspace == undefined)   { // @jalileh this occurs when we have already deleted the current workspace
+				await this._queueActionInternal({ op: "switchworkspace", workspaceId });
+				return;
+			}
+                 
+			if (isNonEmptyUnsavedWorkspace(curWorkspace)) {
                 console.log(
                     `existing unsaved workspace ${this.workspaceId} has content, opening workspace ${workspaceId} in new window`
                 );

emain/emain-window.ts

@@ -52,10 +52,11 @@ func SwitchWorkspace(ctx context.Context, windowId string, workspaceId string) (
 		return nil, fmt.Errorf("error updating window: %w", err)
 	}
 
-	deleted, _, err := DeleteWorkspace(ctx, curWsId, false)
-	if err != nil {
-		return nil, fmt.Errorf("error deleting current workspace: %w", err)
+	deleted, claimableWorkspace, err := DeleteWorkspace(ctx, curWsId, false)
+	if err != nil && claimableWorkspace != "" { // @jalileh since we are waiting for a workspace switch after deleting the current, the curWsid is already deleted.
+		return nil, fmt.Errorf("error deleting workspace: %w", err)
 	}
+
 	if !deleted {
 		log.Printf("current workspace %s was not deleted\n", curWsId)
 	} else {

pkg/wcore/window.go

@@ -151,15 +151,16 @@ func DeleteWorkspace(ctx context.Context, workspaceId string, force bool) (bool,
 		}
 		UnclaimedWorkspace := ""
 		for _, ws := range workspaces {
-			if ws.WindowId == "" {
+			if ws.WindowId == "" && workspaceId != ws.WorkspaceId {
 				UnclaimedWorkspace = ws.WorkspaceId
 				break
 			}
 		}
-		if UnclaimedWorkspace == "" {
-			err = CloseWindow(ctx, windowId, false)
-		} else {
+
+		if UnclaimedWorkspace != "" {
 			return true, UnclaimedWorkspace, nil
+		} else {
+			err = CloseWindow(ctx, windowId, false)
 		}
 
 		if err != nil {