#173: Fixed

FoxTube/Classes/ObjectEventArgs.cs

@@ -121,7 +121,6 @@ namespace FoxTube
         public string Channel { get; private set; }
         public Filters Filter { get; private set; } = new Filters();
 
-
         public SearchParameters(string term)
         {
             Term = term;

FoxTube/Pages/MainPage.xaml.cs

@@ -370,8 +370,16 @@ namespace FoxTube
 
         public void MinimizeAsInitializer()
         {
-            try { (videoPlaceholder.Content as VideoPage).player.minimize_Click(this, null); }
+            if(videoPlaceholder.Content != null)
-            catch { }
+            {
+                if ((videoPlaceholder.Content as VideoPage).loading.State != LoadingState.Loaded)
+                    CloseVideo();
+                else
+                {
+                    try { (videoPlaceholder.Content as VideoPage).player.minimize_Click(this, null); }
+                    catch { }
+                }
+            }
         }
 
         public void MinimizeVideo()

FoxTube/Pages/Search.xaml

@@ -1,5 +1,4 @@
 <Page
-    NavigationCacheMode="Enabled"
     x:Class="FoxTube.Search"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"

FoxTube/Pages/Search.xaml.cs

@@ -92,10 +92,8 @@ namespace FoxTube
                 
         }
 
-        public async void Initialize(SearchParameters arg, bool forceInitialization = false)
+        public async void Initialize(SearchParameters arg)
         {
-            if (Parameters != null && arg.Term == Parameters.Term && !forceInitialization)
-                return;
             loading.Refresh();
             
             //try
@@ -187,7 +185,7 @@ namespace FoxTube
 
         private void AppBarButton_Click(object sender, RoutedEventArgs e)
         {
-            Initialize(Parameters, true);
+            Initialize(Parameters);
         }
 
         private async void more_Clicked()
@@ -244,7 +242,7 @@ namespace FoxTube
             Parameters.Filter.Date = (SearchParameters.Filters.Enumerations.Date)date.SelectedIndex;
             Parameters.Filter.Duration = (SearchParameters.Filters.Enumerations.Duration)duration.SelectedIndex;
             
-            Methods.MainPage.GoToSearch(Parameters);
+            Initialize(Parameters);
         }
     }
 }