From 63b5e0b00ad994f666705be6518fa464c78d89d9 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Tue, 18 Jan 2022 16:48:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AA=E6=9C=89=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=AA=97=E5=8F=A3=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=A4=9A=E5=AA=92=E4=BD=93=E6=8E=A7=E5=88=B6=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Window.vue      | 2 +-
 src/pages/MediaControlPage.vue | 3 +++
 src/pages/WallPage.vue         | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/Window.vue b/src/components/Window.vue
index 5d1b02a..45c6cc2 100644
--- a/src/components/Window.vue
+++ b/src/components/Window.vue
@@ -369,7 +369,6 @@ export default defineComponent({
           }
           focused.value = newValue.focus;
           selected.value = old;
-          $store.commit("setSelectedWindow", props.window.uuid);
         }
       }
     );
@@ -402,6 +401,7 @@ export default defineComponent({
           selected.value = true;
           focused.value = true;
           emit("window_fouse_in", props.window.window_id);
+          $store.commit("setSelectedWindow", props.window.uuid);
         }
       },
       onMouseDown(evt: MouseEvent) {
diff --git a/src/pages/MediaControlPage.vue b/src/pages/MediaControlPage.vue
index 62efaa9..04b1f80 100644
--- a/src/pages/MediaControlPage.vue
+++ b/src/pages/MediaControlPage.vue
@@ -113,6 +113,9 @@ export default defineComponent({
               signal_source.window_type == "EwindowType::Multimedia" ||
               signal_source.window_type == "EwindowType::RTSP";
           }
+        } else {
+          selected_window.value = null;
+          is_multimedia_window.value = false;
         }
       }
     );
diff --git a/src/pages/WallPage.vue b/src/pages/WallPage.vue
index 4405d39..8cf5b57 100644
--- a/src/pages/WallPage.vue
+++ b/src/pages/WallPage.vue
@@ -459,6 +459,7 @@ export default defineComponent({
 
       onWallGridsClick(e: MouseEvent) {
         EventBus.getInstance().emit(EventNamesDefine.UnSelectAllWindows);
+        $store.commit("setSelectedWindow", "");
       },
       resetGeometryOffset(
         window: any,