From bdf2f92c3180cffde47861a783968d9a5d73efc3 Mon Sep 17 00:00:00 2001
From: sawka <mike.sawka@gmail.com>
Date: Mon, 13 Mar 2023 12:23:13 -0700
Subject: [PATCH] swap order (activescreen needs screens set)

---
 src/model.ts | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/model.ts b/src/model.ts
index 7b992651..173543ba 100644
--- a/src/model.ts
+++ b/src/model.ts
@@ -2589,6 +2589,18 @@ class Model {
             }
         }
         let update : ModelUpdateType = genUpdate;
+        if ("screens" in update) {
+            if (update.connect) {
+                this.screenList.clear();
+            }
+            genMergeData(this.screenList, update.screens, (s : Screen) => s.screenId, (sdata : ScreenDataType) => sdata.screenid, (sdata : ScreenDataType) => new Screen(sdata), null);
+            for (let i=0; i<update.screens.length; i++) {
+                let screen = update.screens[i];
+                if (screen.remove) {
+                    this.removeWindowByScreenId(screen.screenid);
+                }
+            }
+        }
         if ("sessions" in update) {
             if (update.connect) {
                 this.sessionList.clear();
@@ -2607,18 +2619,6 @@ class Model {
                 }
             }
         }
-        if ("screens" in update) {
-            if (update.connect) {
-                this.screenList.clear();
-            }
-            genMergeData(this.screenList, update.screens, (s : Screen) => s.screenId, (sdata : ScreenDataType) => sdata.screenid, (sdata : ScreenDataType) => new Screen(sdata), null);
-            for (let i=0; i<update.screens.length; i++) {
-                let screen = update.screens[i];
-                if (screen.remove) {
-                    this.removeWindowByScreenId(screen.screenid);
-                }
-            }
-        }
         if ("activesessionid" in update) {
             this._activateSession(update.activesessionid);
         }