Browse Source
Merge pull request #8897 from affederaffe/dbus-systemdialog-fix
Fix DBusSystemDialog when path contains spaces
pull/8902/head
Max Katz
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
src/Avalonia.FreeDesktop/DBusSystemDialog.cs
|
|
|
@ -72,7 +72,7 @@ namespace Avalonia.FreeDesktop |
|
|
|
using var disposable = await request.WatchResponseAsync(x => tsc.SetResult(x.results["uris"] as string[]), tsc.SetException); |
|
|
|
var uris = await tsc.Task ?? Array.Empty<string>(); |
|
|
|
|
|
|
|
return uris.Select(path => new BclStorageFile(new FileInfo(new Uri(path).AbsolutePath))).ToList(); |
|
|
|
return uris.Select(path => new BclStorageFile(new FileInfo(new Uri(path).LocalPath))).ToList(); |
|
|
|
} |
|
|
|
|
|
|
|
public override async Task<IStorageFile?> SaveFilePickerAsync(FilePickerSaveOptions options) |
|
|
|
@ -96,7 +96,7 @@ namespace Avalonia.FreeDesktop |
|
|
|
var tsc = new TaskCompletionSource<string[]?>(); |
|
|
|
using var disposable = await request.WatchResponseAsync(x => tsc.SetResult(x.results["uris"] as string[]), tsc.SetException); |
|
|
|
var uris = await tsc.Task; |
|
|
|
var path = uris?.FirstOrDefault() is { } filePath ? new Uri(filePath).AbsolutePath : null; |
|
|
|
var path = uris?.FirstOrDefault() is { } filePath ? new Uri(filePath).LocalPath : null; |
|
|
|
|
|
|
|
if (path is null) |
|
|
|
{ |
|
|
|
@ -126,7 +126,7 @@ namespace Avalonia.FreeDesktop |
|
|
|
var uris = await tsc.Task ?? Array.Empty<string>(); |
|
|
|
|
|
|
|
return uris |
|
|
|
.Select(path => new Uri(path).AbsolutePath) |
|
|
|
.Select(path => new Uri(path).LocalPath) |
|
|
|
// WSL2 freedesktop allows to select files as well in directory picker, filter it out.
|
|
|
|
.Where(Directory.Exists) |
|
|
|
.Select(path => new BclStorageFolder(new DirectoryInfo(path))).ToList(); |
|
|
|
|