Avalonia folder pickers use "" for cancel, rather than .NETFX's null.

willowtreeapps · Sep 21, 2021 · 51ed312 · 51ed312
1 parent 67318d5
commit 51ed312
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Client/ViewModels/MainWindowViewModel.cs b/src/Client/ViewModels/MainWindowViewModel.cs
@@ -63,7 +63,7 @@ private async Task<WorkbookModel> NewWorkbookAsync(
         {
             var path = await this.NewWorkbookSpecifyPathInteraction.Handle(Unit.Default);
 
-            if (path == null)
+            if (string.IsNullOrEmpty(path))
             {
                 // We don't have access to the observable subscription or CTS here since it's eaten by Avalonia.
                 throw new TaskCanceledException();
@@ -78,7 +78,7 @@ private async Task<WorkbookModel> LoadWorkbookAsync(
         {
             var path = await this.LoadWorkbookSpecifyPathInteraction.Handle(Unit.Default);
 
-            if (path == null)
+            if (string.IsNullOrEmpty(path))
             {
                 // We don't have access to the observable subscription or CTS here since it's eaten by Avalonia.
                 throw new TaskCanceledException();

diff --git a/src/Client/Workbooks/Views/RequestWorkbookItem.axaml.cs b/src/Client/Workbooks/Views/RequestWorkbookItem.axaml.cs
@@ -45,7 +45,7 @@ public RequestWorkbookItem()
                     .PointerReleased
                     .Select(_ => this.ViewModel?.RequestModel)
                     .Where(requestModel => requestModel != null)
-                    .InvokeCommand(this, view => view.ViewModel!.OpenRequestCommand)
+                    .InvokeCommand(this, view => view.ViewModel!.OpenRequestCommand!)
                     .DisposeWith(disposables);
             });
         }