Removed protocoll string from server profile + fixed CLI install location choice, when called with hidden window

Author: Yelo420

gamevault/UserControls/SettingsComponents/InstallLocationUserControl.xaml.cs

@@ -37,6 +37,9 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
             if (loaded) return;
             loaded = true;
             string lastSelectedRootDirectory = Preferences.Get(AppConfigKey.LastSelectedRootDirectory, LoginManager.Instance.GetUserProfile().UserConfigFile);
+            if (AutoConfirmIfWindowIsHidden(lastSelectedRootDirectory))//possible if called by CLI
+                return;
+
             if (Directory.Exists(lastSelectedRootDirectory))
             {
                 int index = RootDirectories.ToList().FindIndex(x => x.Key.Uri == lastSelectedRootDirectory);
@@ -103,7 +106,24 @@ private void Install_Click(object sender, RoutedEventArgs e)
             }
             catch (Exception ex) { }
         }
-
+        private bool AutoConfirmIfWindowIsHidden(string lastSelectedRootDirectory)
+        {
+            if (App.Instance.MainWindow.IsVisible == false)
+            {
+                if (Directory.Exists(lastSelectedRootDirectory))
+                {
+                    MainWindowViewModel.Instance.ClosePopup();
+                    ResultTaskSource.TrySetResult(lastSelectedRootDirectory);
+                }
+                else
+                {
+                    MainWindowViewModel.Instance.ClosePopup();
+                    ResultTaskSource.TrySetResult(RootDirectories.ElementAt(0).Value);
+                }
+                return true;
+            }
+            return false;
+        }
         private void DirectorySettings_Click(object sender, RoutedEventArgs e)
         {
             MainWindowViewModel.Instance.ClosePopup();

gamevault/UserControls/SettingsComponents/ServerUrlUserControl.xaml

@@ -203,7 +203,7 @@
                             <TextBlock Text="File System" FontSize="20" FontWeight="Bold"/>
                             <!--<settingsComponents:RootPathUserControl Margin="10,10,0,0"/>-->
                             <StackPanel Margin="10,10,0,0">
-                                <TextBlock Text="Root Directories" Margin="0,2,0,2" FontSize="15"/>
+                                <TextBlock Text="Root Directories (A 'GameVault' subfolder will be created)" Margin="0,2,0,2" FontSize="15"/>
                                 <ScrollViewer MaxHeight="100" VerticalScrollBarVisibility="Auto" Width="550" HorizontalAlignment="Left">
                                     <ItemsControl ItemsSource="{Binding RootDirectories}">
                                         <ItemsControl.ItemsPanel>

gamevault/UserControls/SettingsComponents/ServerUrlUserControl.xaml.cs

@@ -295,6 +295,15 @@ private void ValidateSignUpData()
         }
         private string RemoveSpecialCharacters(string str)
         {
+            if (str.StartsWith("http://", StringComparison.OrdinalIgnoreCase))
+            {
+                str = str.Substring(7);
+            }
+            else if (str.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
+            {
+                str = str.Substring(8);
+            }
+
             StringBuilder sb = new StringBuilder();
             foreach (char c in str)
             {