Merge pull request #12377 from ThereGoesMySanity/dbus-fallback-fix

Catch dbus errors so that WatchAsync can register all names
AvaloniaUI · Jul 30, 2023 · 6a80ef8 · 6a80ef8
2 parents 9808a44 + e1ac9be
commit 6a80ef8
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs b/src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
@@ -62,9 +62,15 @@ private async Task WatchAsync()
             foreach (var name in _knownNames)
             {
                 var dbus = new OrgFreedesktopDBus(Connection, "org.freedesktop.DBus", "/org/freedesktop/DBus");
-                _disposables.Add(await dbus.WatchNameOwnerChangedAsync(OnNameChange));
-                var nameOwner = await dbus.GetNameOwnerAsync(name);
-                OnNameChange(null, (name, null, nameOwner));
+                try
+                {
+                    _disposables.Add(await dbus.WatchNameOwnerChangedAsync(OnNameChange));
+                    var nameOwner = await dbus.GetNameOwnerAsync(name);
+                    OnNameChange(null, (name, null, nameOwner));
+                }
+                catch (DBusException)
+                {
+                }
             }
         }