Skip to content

Commit 82d581d

Browse files
authored
Merge pull request #30 from shatyuka/fix/wpe-check
Use soname in WPEWebkit availability check
2 parents 64c3c7f + cc45ebf commit 82d581d

1 file changed

Lines changed: 3 additions & 13 deletions

File tree

src/Avalonia.Controls.WebView.Core/Linux/WpeWebViewAdapter.cs

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -101,23 +101,13 @@ private static bool CheckAvailability()
101101
return false;
102102
}
103103

104-
if (!NativeLibrary.TryLoad("libWPEWebKit-2.0.so", out var webkitHandle))
104+
if (!NativeLibrary.TryLoad("libWPEWebKit-2.0.so.1", out _))
105105
return false;
106-
if (!NativeLibrary.TryLoad("libWPEBackend-fdo-1.0.so", out var fdoHandle))
107-
{
108-
NativeLibrary.Free(webkitHandle);
106+
if (!NativeLibrary.TryLoad("libWPEBackend-fdo-1.0.so.1", out _))
109107
return false;
110-
}
111-
if (!NativeLibrary.TryLoad("libwpe-1.0.so", out var wpeHandle))
112-
{
113-
NativeLibrary.Free(fdoHandle);
114-
NativeLibrary.Free(webkitHandle);
108+
if (!NativeLibrary.TryLoad("libwpe-1.0.so.1", out _))
115109
return false;
116-
}
117110

118-
NativeLibrary.Free(wpeHandle);
119-
NativeLibrary.Free(fdoHandle);
120-
NativeLibrary.Free(webkitHandle);
121111
return true;
122112
}
123113

0 commit comments

Comments
 (0)