From 97ad7a42bdeb7ba6460aa24e562ae4bbe2dbbd4d Mon Sep 17 00:00:00 2001
From: Kingtous <kingtous@qq.com>
Date: Thu, 16 Feb 2023 10:58:27 +0800
Subject: [PATCH] fix: window manager called on Android & bugfix etc.

---
 flutter/lib/common.dart                         | 3 +++
 flutter/lib/desktop/widgets/remote_menubar.dart | 2 +-
 src/ui/header.tis                               | 3 ---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart
index ba7e3d762..8a33f214c 100644
--- a/flutter/lib/common.dart
+++ b/flutter/lib/common.dart
@@ -336,6 +336,9 @@ closeConnection({String? id}) {
 }
 
 void window_on_top(int? id) {
+  if (!isDesktop) {
+    return;
+  }
   if (id == null) {
     // main window
     windowManager.restore();
diff --git a/flutter/lib/desktop/widgets/remote_menubar.dart b/flutter/lib/desktop/widgets/remote_menubar.dart
index 933850c99..0fa12cd6f 100644
--- a/flutter/lib/desktop/widgets/remote_menubar.dart
+++ b/flutter/lib/desktop/widgets/remote_menubar.dart
@@ -769,7 +769,7 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
             : MenuButton(
                 icon: _getVoiceCallIcon(),
                 tooltip: translate(tooltipText),
-                onPressed: () => bind.sessionRequestVoiceCall(id: widget.id),
+                onPressed: () => bind.sessionCloseVoiceCall(id: widget.id),
                 color: _MenubarTheme.redColor,
                 hoverColor: _MenubarTheme.hoverRedColor,
               );
diff --git a/src/ui/header.tis b/src/ui/header.tis
index 009995f4f..1fb694397 100644
--- a/src/ui/header.tis
+++ b/src/ui/header.tis
@@ -434,9 +434,6 @@ function toggleMenuState() {
     var c = handler.get_option("codec-preference");
     if (!c) c = "auto";
     values.push(c);
-    var a = handler.get_audio_mode();
-    if (!a) a = "guest-to-host";
-    values.push(a);
     for (var el in $$(menu#display-options li)) {
         el.attributes.toggleClass("selected", values.indexOf(el.id) >= 0);
     }