Merge pull request #108 from FrozenAssassine/fixfor#105

Fix: add tabs only to recylce bin when they were modified
FrozenAssassine · May 10, 2023 · d6d5488 · d6d5488
2 parents a3280dd + 14dd27e
commit d6d5488
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Fastedit/Tab/TabPageHelper.cs b/Fastedit/Tab/TabPageHelper.cs
@@ -257,8 +257,10 @@ public static async Task<bool> CloseTab(TabView tabView, object tabItem)
         }
         private static async Task<bool> RemoveTab(TabView tabView, TabPageItem tab)
         {
-            if (!await RecycleBinDialog.MoveFileToRecycleBin(tab))
-                return false;
+            //only add the file to the recylcbin when it has some content and was modified
+            if (tab.DatabaseItem.IsModified && tab.textbox.CharacterCount > 0)
+                if (!await RecycleBinDialog.MoveFileToRecycleBin(tab))
+                    return false;
 
             tab.textbox.Unload();
             tabView.TabItems.Remove(tab);

diff --git a/Fastedit/Views/TabWindowPage.xaml.cs b/Fastedit/Views/TabWindowPage.xaml.cs
@@ -3,6 +3,7 @@
 using Fastedit.Storage;
 using Fastedit.Tab;
 using System;
+using System.Linq;
 using Windows.UI.WindowManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
@@ -65,6 +66,10 @@ private async void Open_Click(object sender, RoutedEventArgs e)
             if (tab.DatabaseItem.IsModified && !await AskSaveDialog.Show(tab, this.XamlRoot))
                 return;
 
+            //only add the file to the recylcbin when it has some content and was modified
+            if (tab.DatabaseItem.IsModified && tab.textbox.CharacterCount > 0)
+                await RecycleBinDialog.MoveFileToRecycleBin(tab);
+
             await OpenFileHelper.OpenFileForTab(tab);
         }