Skip to content

A Swiss Army knife for developers.

Fixed bug with Release build

Etienne Baudoux5aaf74057a53
diff --git a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
index f82235660..1f8b9c88d 100644
--- a/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
+++ b/src/dev/impl/DevTools.Impl/ViewModels/MainPageViewModel.cs
@@ -3,12 +3,15 @@
using DevTools.Common;
using DevTools.Core;
using DevTools.Core.Collections;
+using DevTools.Core.Navigation;
+using DevTools.Core.Settings;
using DevTools.Core.Threading;
using DevTools.Impl.Messages;
using DevTools.Impl.Models;
using DevTools.Providers;
using Microsoft.Toolkit.Mvvm.ComponentModel;
using Microsoft.Toolkit.Mvvm.Input;
+using Microsoft.Toolkit.Mvvm.Messaging;
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
@@ -20,13 +23,9 @@ using System.Threading.Tasks;
using System.Web;
using Windows.Foundation;
using Windows.UI.ViewManagement;
-using Windows.UI.Xaml.Controls;
-using Microsoft.Toolkit.Mvvm.Messaging;
using Windows.UI.Xaml;
-using DevTools.Core.Settings;
+using Windows.UI.Xaml.Controls;
using ThreadPriority = DevTools.Core.Threading.ThreadPriority;
-using DevTools.Core.Navigation;
-using System.Diagnostics;
namespace DevTools.Impl.ViewModels
{
@@ -40,7 +39,7 @@ namespace DevTools.Impl.ViewModels
private readonly ISettingsProvider _settingsProvider;
private readonly List<MatchedToolProviderViewData> _allToolsMenuitems = new();
private readonly DisposableSempahore _sempahore = new();
- private readonly Task _firstUpdateMenuTask;
+ private readonly Lazy<Task> _firstUpdateMenuTask;
private MatchedToolProviderViewData? _selectedItem;
private NavigationViewDisplayMode _navigationViewDisplayMode;
@@ -217,7 +216,7 @@ namespace DevTools.Impl.ViewModels
OpenToolInNewWindowCommand = new AsyncRelayCommand<ToolProviderMetadata>(ExecuteOpenToolInNewWindowCommandAsync);
ChangeViewModeCommand = new AsyncRelayCommand<ApplicationViewMode>(ExecuteChangeViewModeCommandAsync);
- _firstUpdateMenuTask = UpdateMenuAsync(searchQuery: string.Empty);
+ _firstUpdateMenuTask = new Lazy<Task>(() => UpdateMenuAsync(searchQuery: string.Empty));
Window.Current.Activated += Window_Activated;
@@ -277,7 +276,7 @@ namespace DevTools.Impl.ViewModels
internal async Task OnNavigatedToAsync(NavigationParameter parameters)
{
// Make sure the menu items exist.
- await _firstUpdateMenuTask.ConfigureAwait(false);
+ await _firstUpdateMenuTask.Value.ConfigureAwait(false);
MatchedToolProviderViewData? toolProviderViewDataToSelect = null;
if (!string.IsNullOrWhiteSpace(parameters.Query))
@@ -422,7 +421,7 @@ namespace DevTools.Impl.ViewModels
string clipboardContent = await _clipboard.GetClipboardContentAsTextAsync().ConfigureAwait(false);
// Make sure the menu items exist.
- await _firstUpdateMenuTask.ConfigureAwait(false);
+ await _firstUpdateMenuTask.Value.ConfigureAwait(false);
MatchedToolProviderViewData[] oldRecommendedTools = _allToolsMenuitems.Where(item => item.IsRecommended).ToArray();
@@ -468,7 +467,6 @@ namespace DevTools.Impl.ViewModels
{
if (!IsInCompactOverlayMode && _allowSelectAutomaticallyRecommendedTool)
{
- SelectedMenuItem = recommendedTools[0];
SetSelectedMenuItem(recommendedTools[0], clipboardContent);
}
});
diff --git a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs
index 5d7b1dede..ef74fbebb 100644
--- a/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs
+++ b/src/dev/impl/DevTools.Impl/Views/MainPage.xaml.cs
@@ -7,7 +7,6 @@ using DevTools.Core.Threading;
using DevTools.Impl.Messages;
using DevTools.Impl.ViewModels;
using Microsoft.Toolkit.Mvvm.Messaging;
-using System.Diagnostics;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Media.Animation;
@@ -19,6 +18,7 @@ namespace DevTools.Impl.Views
{
private IMefProvider? _mefProvider;
private IThread? _thread;
+ private NavigationParameter? _parameters;
public static readonly DependencyProperty ViewModelProperty =
DependencyProperty.Register(
@@ -45,21 +45,30 @@ namespace DevTools.Impl.Views
// Register all recipient for messages
WeakReferenceMessenger.Default.RegisterAll(this);
+
+ Loaded += MainPage_Loaded;
+ }
+
+ private void MainPage_Loaded(object sender, RoutedEventArgs e)
+ {
+ Assumes.NotNull(_parameters, nameof(_parameters));
+
+ // Calling OnNavigatedToAsync in Loaded event instead of OnNavigatedTo because it needs access to CoreDispatcher,
+ // which isn't available before the main window is created.
+ ViewModel.OnNavigatedToAsync(_parameters!).Forget();
}
protected override void OnNavigatedTo(NavigationEventArgs e)
{
- var parameters = (NavigationParameter)e.Parameter;
+ _parameters = (NavigationParameter)e.Parameter;
- _mefProvider = parameters.ExportProvider;
+ _mefProvider = _parameters.ExportProvider;
_thread = _mefProvider.Import<IThread>();
// Set the view model
- ViewModel = parameters.ExportProvider.Import<MainPageViewModel>();
+ ViewModel = _mefProvider!.Import<MainPageViewModel>();
DataContext = ViewModel;
- ViewModel.OnNavigatedToAsync(parameters).Forget();
-
base.OnNavigatedTo(e);
}