Browse Source
Merge pull request #12377 from ThereGoesMySanity/dbus-fallback-fix
Catch dbus errors so that WatchAsync can register all names
release/11.0.2
Nikita Tsukanov
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
9 additions and
3 deletions
-
src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
|
|
|
@ -62,9 +62,15 @@ namespace Avalonia.FreeDesktop.DBusIme |
|
|
|
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) |
|
|
|
{ |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
