Fix double loading of items upon layout change

Author: lukeblevins

Files/BaseLayout.cs

@@ -99,7 +99,6 @@ public ListedItem SelectedItem
         public BaseLayout()
         {
             this.Loaded += Page_Loaded;
-            App.AppSettings.LayoutModeChangeRequested += AppSettings_LayoutModeChangeRequested;
             Page_Loaded(null, null);
 
             // QuickLook Integration
@@ -114,7 +113,7 @@ public BaseLayout()
 
         private void AppSettings_LayoutModeChangeRequested(object sender, EventArgs e)
         {
-            if(App.CurrentInstance.ContentPage != null)
+            if (App.CurrentInstance.ContentPage != null)
             {
                 App.CurrentInstance.ViewModel.CancelLoadAndClearFiles();
                 if (App.AppSettings.LayoutMode == 0)
@@ -140,6 +139,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
         {
             base.OnNavigatedTo(eventArgs);
             // Add item jumping handler
+            App.AppSettings.LayoutModeChangeRequested += AppSettings_LayoutModeChangeRequested;
             Window.Current.CoreWindow.CharacterReceived += Page_CharacterReceived;
             var parameters = (string)eventArgs.Parameter;
             if (App.AppSettings.FormFactor == Enums.FormFactorMode.Regular)
@@ -177,6 +177,7 @@ protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
             {
                 App.CurrentInstance.ViewModel._fileQueryResult.ContentsChanged -= App.CurrentInstance.ViewModel.FileContentsChanged;
             }
+            App.AppSettings.LayoutModeChangeRequested -= AppSettings_LayoutModeChangeRequested;
         }
 
         private void UnloadMenuFlyoutItemByName(string nameToUnload)