From 02862490b3dbd3c0fe50b321b01996aee9a7043a Mon Sep 17 00:00:00 2001
From: Michael Gordeev <mikhailagord@gmail.com>
Date: Fri, 14 Sep 2018 17:16:59 +0300
Subject: [PATCH] #173: Fixed

---
 FoxTube/Classes/ObjectEventArgs.cs |  1 -
 FoxTube/Pages/MainPage.xaml.cs     | 12 ++++++++++--
 FoxTube/Pages/Search.xaml          |  1 -
 FoxTube/Pages/Search.xaml.cs       | 10 ++++------
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/FoxTube/Classes/ObjectEventArgs.cs b/FoxTube/Classes/ObjectEventArgs.cs
index db18307..23cd9d0 100644
--- a/FoxTube/Classes/ObjectEventArgs.cs
+++ b/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;
diff --git a/FoxTube/Pages/MainPage.xaml.cs b/FoxTube/Pages/MainPage.xaml.cs
index 13d7e07..8b76f43 100644
--- a/FoxTube/Pages/MainPage.xaml.cs
+++ b/FoxTube/Pages/MainPage.xaml.cs
@@ -370,8 +370,16 @@ namespace FoxTube
 
         public void MinimizeAsInitializer()
         {
-            try { (videoPlaceholder.Content as VideoPage).player.minimize_Click(this, null); }
-            catch { }
+            if(videoPlaceholder.Content != null)
+            {
+                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()
diff --git a/FoxTube/Pages/Search.xaml b/FoxTube/Pages/Search.xaml
index 0ed8d0e..888dd35 100644
--- a/FoxTube/Pages/Search.xaml
+++ b/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"
diff --git a/FoxTube/Pages/Search.xaml.cs b/FoxTube/Pages/Search.xaml.cs
index 3671c1e..6ec6459 100644
--- a/FoxTube/Pages/Search.xaml.cs
+++ b/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()
@@ -243,8 +241,8 @@ namespace FoxTube
             Parameters.Filter.Type = (SearchParameters.Filters.Enumerations.Type)type.SelectedIndex;
             Parameters.Filter.Date = (SearchParameters.Filters.Enumerations.Date)date.SelectedIndex;
             Parameters.Filter.Duration = (SearchParameters.Filters.Enumerations.Duration)duration.SelectedIndex;
-
-            Methods.MainPage.GoToSearch(Parameters);
+            
+            Initialize(Parameters);
         }
     }
 }