Fix navigation on network drive root

Author: gave92

Files/Filesystem/Drives.cs

@@ -340,7 +340,7 @@ public static async Task<StorageFolderWithPath> GetRootFromPath(string devicePat
                 return null;
             }
             var rootPath = Path.GetPathRoot(devicePath);
-            if (devicePath.StartsWith("\\\\?\\"))
+            if (devicePath.StartsWith("\\\\?\\")) // USB device
             {
                 // Check among already discovered drives
                 StorageFolder matchingDrive = App.AppSettings.DrivesManager.Drives.FirstOrDefault(x =>
@@ -371,11 +371,12 @@ public static async Task<StorageFolderWithPath> GetRootFromPath(string devicePat
                     return new StorageFolderWithPath(matchingDrive, rootPath);
                 }
             }
+            else if (devicePath.StartsWith("\\\\")) // Network share
+            {
+                rootPath = rootPath.LastIndexOf("\\") > 1 ? rootPath.Substring(0, rootPath.LastIndexOf("\\")) : rootPath; // Remove share name
+                return new StorageFolderWithPath(await StorageFolder.GetFolderFromPathAsync(rootPath), rootPath);
+            }
             // It's ok to return null here, on normal drives StorageFolder.GetFolderFromPathAsync works
-            //else
-            //{
-            //    return new StorageFolderWithPath(await StorageFolder.GetFolderFromPathAsync(rootPath), rootPath);
-            //}
             return null;
         }
 

Files/UserControls/ModernNavigationToolbar.xaml.cs

@@ -243,17 +243,18 @@ public async void CheckPathInput(ItemViewModel instance, string currentInput, st
 
                     currentInput = StorageFileExtensions.GetPathWithoutEnvironmentVariable(currentInput);
                     if (currentSelectedPath == currentInput) return;
-                    var item = await DrivesManager.GetRootFromPath(currentInput);
 
                     try
                     {
+                        var item = await DrivesManager.GetRootFromPath(currentInput);
                         var pathToNavigate = (await StorageFileExtensions.GetFolderWithPathFromPathAsync(currentInput, item)).Path;
                         App.CurrentInstance.ContentFrame.Navigate(AppSettings.GetLayoutType(), pathToNavigate); // navigate to folder
                     }
                     catch (Exception) // Not a folder or inaccessible
                     {
                         try
                         {
+                            var item = await DrivesManager.GetRootFromPath(currentInput);
                             var pathToInvoke = (await StorageFileExtensions.GetFileWithPathFromPathAsync(currentInput, item)).Path;
                             await Interaction.InvokeWin32Component(pathToInvoke);
                         }