maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[FZE] Fix crash when double clicking edit layout (#12609)

Browse source
This commit is contained in:
Jaime Bernardo 2021-08-04 15:23:28 +01:00 committed by GitHub
parent 7751fed39e
commit 37e130a1a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
View file

@ -26,6 +26,7 @@ namespace FancyZonesEditor
private LayoutModel _backup;
private ContentDialog _openedDialog;
private bool _openingDialog = false; // Is the dialog being opened.
public int WrapPanelItemSize { get; set; } = DefaultWrapPanelItemSize;
@ -247,19 +248,32 @@ namespace FancyZonesEditor
private async void EditLayout_Click(object sender, RoutedEventArgs e)
{
var dataContext = ((FrameworkElement)sender).DataContext;
Select((LayoutModel)dataContext);
if (_settings.SelectedModel is GridLayoutModel grid)
// Avoid trying to open the same dialog twice.
if (!_openingDialog)
{
_backup = new GridLayoutModel(grid);
}
else if (_settings.SelectedModel is CanvasLayoutModel canvas)
{
_backup = new CanvasLayoutModel(canvas);
}
_openingDialog = true;
try
{
var dataContext = ((FrameworkElement)sender).DataContext;
Select((LayoutModel)dataContext);
await EditLayoutDialog.ShowAsync();
if (_settings.SelectedModel is GridLayoutModel grid)
{
_backup = new GridLayoutModel(grid);
}
else if (_settings.SelectedModel is CanvasLayoutModel canvas)
{
_backup = new CanvasLayoutModel(canvas);
}
await EditLayoutDialog.ShowAsync();
}
catch
{
_openingDialog = false;
throw;
}
}
}
private void EditZones_Click(object sender, RoutedEventArgs e)
@ -411,6 +425,7 @@ namespace FancyZonesEditor
private void Dialog_Closed(ContentDialog sender, ContentDialogClosedEventArgs args)
{
_openingDialog = false;
_openedDialog = null;
}