From 6eb02a1a08bbf12b5ed7cf4e612242f9d2c691c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= Date: Sat, 19 Feb 2022 23:30:06 +0100 Subject: [PATCH] Simplify fix time waiting --- .../FileTime.Avalonia/Application/TabContainer.cs | 10 ++++------ .../FileTime.Avalonia/ViewModels/MainPageViewModel.cs | 1 - 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/GuiApp/FileTime.Avalonia/Application/TabContainer.cs b/src/GuiApp/FileTime.Avalonia/Application/TabContainer.cs index 0d2d365..8528c2e 100644 --- a/src/GuiApp/FileTime.Avalonia/Application/TabContainer.cs +++ b/src/GuiApp/FileTime.Avalonia/Application/TabContainer.cs @@ -193,16 +193,14 @@ namespace FileTime.Avalonia.Application await UpdateParents(token); - var start = DateTime.Now; - if (!skipCancellationWaiting) { - do + try { - await Task.Delay(1, token); - if (token.IsCancellationRequested) return; + await Task.Delay(500, token); } - while ((DateTime.Now - start).Milliseconds <= 500); + catch { } + if (token.IsCancellationRequested) return; } ChildContainer = newChildContainer; diff --git a/src/GuiApp/FileTime.Avalonia/ViewModels/MainPageViewModel.cs b/src/GuiApp/FileTime.Avalonia/ViewModels/MainPageViewModel.cs index 4e79ca4..3d021b0 100644 --- a/src/GuiApp/FileTime.Avalonia/ViewModels/MainPageViewModel.cs +++ b/src/GuiApp/FileTime.Avalonia/ViewModels/MainPageViewModel.cs @@ -165,7 +165,6 @@ namespace FileTime.Avalonia.ViewModels } places.Add(new PlaceInfo(name, container)); } - } LocalContentProvider.Unload(); }