Fix DBus Exception on window close (AvaloniaUI#13997)

* Only disconnect from ibus when connected * Catch exception on Destroy when ime context is successfully created but doesn't actually exist
jcyuan · Dec 22, 2023 · 8756fef · 8756fef
1 parent 960db26
commit 8756fef
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
@@ -179,12 +179,23 @@ protected void AddDisposable(IDisposable? d)
                 _disposables.Add(d);
         }
 
-        public void Dispose()
+        public async void Dispose()
         {
             foreach(var d in _disposables)
                 d.Dispose();
             _disposables.Clear();
-            _ = DisconnectAsync();
+            if (!IsConnected)
+                return;
+            try
+            {
+                await DisconnectAsync();
+            }
+            catch (Exception ex)
+            {
+                Logger.TryGet(LogEventLevel.Error, "IME")
+                    ?.Log(this, "Error while destroying the context:\n" + ex);
+            }
+
             _currentName = null;
         }