fixed sorting

Author: Abdesol

.idea/.idea.CutCode/.idea/workspace.xml

@@ -168,8 +168,17 @@ public async void ComboBoxCommand(string sort)
             else
             {
                 _languageSort = sort;
-                var codes = await DataBase.OrderCode(_languageSort, favcodes, "Favourite");
-                CodeModeToViewModel(await  DataBase.OrderCode(_basicSort, codes, "Favourite"));
+                if(_isSearchCancelled)
+                {
+                    var codes = await DataBase.OrderCode(_languageSort, DataBase.AllCodes);
+                    CodeModeToViewModel(await  DataBase.OrderCode(_basicSort, codes, "Favourite"));
+                }
+                else
+                {
+                    var codes = await DataBase.SearchCode(_searchText, "Favourite");
+                    codes = await DataBase.OrderCode(_languageSort, codes);
+                    CodeModeToViewModel(await  DataBase.OrderCode(_basicSort, codes, "Favourite"));
+                }
             }
             VisChange("Not found :(");
         }
@@ -181,8 +190,12 @@ public bool IsSearchBusy
             set => this.RaiseAndSetIfChanged(ref _isSearchBusy, value);
 
         }
+        
+        private string _searchText;
         public async void SearchCommand(string text)
         {
+            _searchText = text;
+            _isSearchCancelled = false;
             if (string.IsNullOrEmpty(text)) return;
             IsSearchBusy = true;
             if(text != "" && AllFavouriteCodes.Count > 0)
@@ -194,12 +207,14 @@ public async void SearchCommand(string text)
             IsSearchBusy = false;
         }
 
+        private bool _isSearchCancelled = true;
         public async void SearchCancelled()
         {
             var allCodes = AllFavouriteCodes.Select(c => c.Code).ToList();
             allCodes = await DataBase.OrderCode(_languageSort, allCodes, "Favourite");
             CodeModeToViewModel(allCodes);
             VisChange();
+            _isSearchCancelled = true;
         }
     }
 }