Improve tooltip message display when optimizing images

Ruben2776 · Nov 11, 2021 · bb8b518 · bb8b518
1 parent 70715d2
commit bb8b518
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/PicView/ImageHandling/ImageFunctions.cs b/PicView/ImageHandling/ImageFunctions.cs
@@ -41,16 +41,8 @@ internal static async Task OptimizeImageAsyncWithErrorChecking()
         {
             if (Error_Handling.CheckOutOfRange()) { return; }
 
-            var preloadValue = Preloader.Get(Navigation.Pics[Navigation.FolderIndex]);
-            if (preloadValue == null)
-            {
-                await Preloader.AddAsync(Navigation.FolderIndex).ConfigureAwait(false);
-            }
-
             bool toCenter = false;
 
-            var success = await OptimizeImageAsync(Navigation.Pics[Navigation.FolderIndex]).ConfigureAwait(false);
-
             await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Normal, () =>
             {
                 toCenter = UC.QuickSettingsMenuOpen;
@@ -62,6 +54,8 @@ await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(System.Windows.Threa
 
             Tooltip.ShowTooltipMessage(Application.Current.Resources["Applying"] as string, toCenter);
 
+            var success = await OptimizeImageAsync(Navigation.Pics[Navigation.FolderIndex]).ConfigureAwait(false);
+
             if (success)
             {
                 await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Render, () =>
@@ -73,6 +67,17 @@ await ConfigureWindows.GetMainWindow.Dispatcher.BeginInvoke(System.Windows.Threa
                     Tooltip.CloseToolTipMessage();
                 });
             }
+            else
+            {
+                Tooltip.ShowTooltipMessage($"0%", toCenter);
+                return;
+            }
+
+            var preloadValue = Preloader.Get(Navigation.Pics[Navigation.FolderIndex]);
+            if (preloadValue == null)
+            {
+                await Preloader.AddAsync(Navigation.FolderIndex).ConfigureAwait(false);
+            }
 
             var fileInfo = new System.IO.FileInfo(Navigation.Pics[Navigation.FolderIndex]);
             var readablePrevSize = FileHandling.FileFunctions.GetSizeReadable(preloadValue.fileInfo.Length);