From 228b46252101d543be99e80421cf7bd69f58928a Mon Sep 17 00:00:00 2001
From: duke7553 <lukeblevins15@gmail.com>
Date: Fri, 10 May 2019 22:50:23 -0400
Subject: [PATCH] Fix Duplicated Refresh Bug

---
 ExecutableLauncher/Program.cs         |  4 +++-
 Files UWP/Filesystem/ItemViewModel.cs | 12 ++----------
 Files UWP/GenericFileBrowser.xaml.cs  |  1 -
 Files UWP/ProHome.xaml.cs             |  3 +--
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/ExecutableLauncher/Program.cs b/ExecutableLauncher/Program.cs
index dd9fd0af0280..fc892722efee 100644
--- a/ExecutableLauncher/Program.cs
+++ b/ExecutableLauncher/Program.cs
@@ -13,9 +13,11 @@ private static void Main(string[] args)
                 var executable = (string)ApplicationData.Current.LocalSettings.Values["Application"];
                 Process.Start(executable);
             }
-            catch (Exception e)
+            catch (System.ComponentModel.Win32Exception e)
             {
+                Console.WriteLine("While most executables work now, UWP restrictions still prevent the execution of this file");
                 Console.WriteLine(e.Message);
+                Console.WriteLine(e.StackTrace);
                 Console.ReadLine();
             }
         }
diff --git a/Files UWP/Filesystem/ItemViewModel.cs b/Files UWP/Filesystem/ItemViewModel.cs
index 83a0096d2c5b..65af94358677 100644
--- a/Files UWP/Filesystem/ItemViewModel.cs	
+++ b/Files UWP/Filesystem/ItemViewModel.cs	
@@ -215,16 +215,8 @@ public async void AddItemsToCollectionAsync(string path, Page currentPage)
 
             _cancellationTokenSource = new CancellationTokenSource();
 
-            if (typeof(PageType) == typeof(GenericFileBrowser))
-            {
-                (currentPage as GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Collapsed;
-                _filesAndFolders.Clear();
-            }
-            else if (typeof(PageType) == typeof(PhotoAlbum))
-            {
-                (currentPage as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Collapsed;
-                _filesAndFolders.Clear();
-            }
+            GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible = Visibility.Collapsed;
+            _filesAndFolders.Clear();
             Universal.path = path;
 
             Stopwatch stopwatch = new Stopwatch();
diff --git a/Files UWP/GenericFileBrowser.xaml.cs b/Files UWP/GenericFileBrowser.xaml.cs
index 121802e2c983..47b663910dd5 100644
--- a/Files UWP/GenericFileBrowser.xaml.cs	
+++ b/Files UWP/GenericFileBrowser.xaml.cs	
@@ -105,7 +105,6 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
             var parameters = (string)eventArgs.Parameter;
             instanceViewModel.CancelLoadAndClearFiles();
             instanceViewModel.Universal.path = parameters;
-            CurrentInstance.RefreshButton.Click += NavigationActions.Refresh_Click;
             CurrentInstance.AddItemButton.Click += AddItem_Click;
             instanceViewModel.AddItemsToCollectionAsync(instanceViewModel.Universal.path, this);
             TextState_PropertyChanged(null, null);
diff --git a/Files UWP/ProHome.xaml.cs b/Files UWP/ProHome.xaml.cs
index ee6af7cf3a1e..28d2d4dfc904 100644
--- a/Files UWP/ProHome.xaml.cs	
+++ b/Files UWP/ProHome.xaml.cs	
@@ -89,6 +89,7 @@ public ProHome()
             PopulateNavViewWithExternalDrives();
             BackButton.Click += NavigationActions.Back_Click;
             ForwardButton.Click += NavigationActions.Forward_Click;
+            RefreshButton.Click += NavigationActions.Refresh_Click;
             ribbonShadow.Receivers.Add(RibbonShadowSurface);
             Ribbon.Translation += new System.Numerics.Vector3(0, 0, 4);
 
@@ -806,14 +807,12 @@ public async static void Refresh_Click(object sender, RoutedEventArgs e)
                 {
                     var ContentOwnedViewModelInstance = (ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).instanceViewModel;
                     ContentOwnedViewModelInstance.CancelLoadAndClearFiles();
-                    (ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).emptyTextGFB.Visibility = Visibility.Collapsed;
                     ContentOwnedViewModelInstance.AddItemsToCollectionAsync(ContentOwnedViewModelInstance.Universal.path, (ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as GenericFileBrowser).GFBPageName);
                 }
                 else if ((ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum) != null)
                 {
                     var ContentOwnedViewModelInstance = (ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).instanceViewModel;
                     ContentOwnedViewModelInstance.CancelLoadAndClearFiles();
-                    (ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).EmptyTextPA.Visibility = Visibility.Collapsed;
                     ContentOwnedViewModelInstance.AddItemsToCollectionAsync(ContentOwnedViewModelInstance.Universal.path, (ItemViewModel<ProHome>.GetCurrentSelectedTabInstance<ProHome>().accessibleContentFrame.Content as PhotoAlbum).PAPageName);
                 }