[Bugfix] - When creating new sessions port was 0

BornToBeRoot · BornToBeRoot · commit 4f937b23b0ed · 2018-04-17T21:59:08.000+02:00
diff --git a/Source/NETworkManager/ViewModels/PuTTYSessionConnectViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYSessionConnectViewModel.cs
@@ -275,8 +275,6 @@ public PuTTYSessionConnectViewModel(Action<PuTTYSessionConnectViewModel> connect
 
             // SSH is default...
             UseSSH = true;
-        }
-
-        
+        }        
     }
 }
diff --git a/Source/NETworkManager/ViewModels/PuTTYSessionViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYSessionViewModel.cs
@@ -45,7 +45,7 @@ public string Name
             }
         }
 
-        private bool _useSSH = true; // Default is SSH
+        private bool _useSSH; // Default is SSH
         public bool UseSSH
         {
             get { return _useSSH; }
@@ -356,6 +356,7 @@ public PuTTYSessionViewModel(Action<PuTTYSessionViewModel> saveCommand, Action<P
 
             switch (_sessionInfo.ConnectionMode)
             {
+                // SSH is default
                 case ConnectionMode.SSH:
                     UseSSH = true;
                     break;
@@ -381,7 +382,7 @@ public PuTTYSessionViewModel(Action<PuTTYSessionViewModel> saveCommand, Action<P
             else
             {
                 Host = _sessionInfo.HostOrSerialLine;
-                Port = _sessionInfo.PortOrBaud;
+                Port = _sessionInfo.PortOrBaud == 0 ? SettingsManager.Current.PuTTY_SSHPort : _sessionInfo.PortOrBaud; // Default SSH port
             }
 
             Username = _sessionInfo.Username;
@@ -394,7 +395,7 @@ public PuTTYSessionViewModel(Action<PuTTYSessionViewModel> saveCommand, Action<P
 
             _groups = CollectionViewSource.GetDefaultView(groups);
             _groups.SortDescriptions.Add(new SortDescription());
-
+            
             _isLoading = false;
         }
 
diff --git a/Source/NETworkManager/ViewModels/PuTTYViewModel.cs b/Source/NETworkManager/ViewModels/PuTTYViewModel.cs
@@ -255,7 +255,7 @@ private async void AddSessionAction()
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);
                 ConfigurationManager.Current.FixAirspace = false;
 
-                PuTTYSessionManager.AddSession(new Models.Settings.PuTTYSessionInfo(instance.Name, instance.ConnectionMode, instance.ConnectionMode == Models.PuTTY.PuTTY.ConnectionMode.Serial ? instance.SerialLine : instance.Host, instance.ConnectionMode == Models.PuTTY.PuTTY.ConnectionMode.Serial ? instance.Baud : instance.Port, instance.Username, instance.Profile, instance.AdditionalCommandLine, instance.Group, instance.Tags));
+                PuTTYSessionManager.AddSession(new Models.Settings.PuTTYSessionInfo(instance.Name, instance.ConnectionMode, instance.ConnectionMode == PuTTY.ConnectionMode.Serial ? instance.SerialLine : instance.Host, instance.ConnectionMode == PuTTY.ConnectionMode.Serial ? instance.Baud : instance.Port, instance.Username, instance.Profile, instance.AdditionalCommandLine, instance.Group, instance.Tags));
             }, instance =>
             {
                 dialogCoordinator.HideMetroDialogAsync(this, customDialog);

Original file line number	Diff line number	Diff line change
`@@ -275,8 +275,6 @@ public PuTTYSessionConnectViewModel(Action<PuTTYSessionConnectViewModel> connect`
`275`	`275`
`276`	`276`	`// SSH is default...`
`277`	`277`	`UseSSH = true;`
`278`		`- }`
`279`		`-`
`280`		`-`
	`278`	`+ }`
`281`	`279`	`}`
`282`	`280`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public string Name`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- private bool _useSSH = true; // Default is SSH`
	`48`	`+ private bool _useSSH; // Default is SSH`
`49`	`49`	`public bool UseSSH`
`50`	`50`	`{`
`51`	`51`	`get { return _useSSH; }`
`@@ -356,6 +356,7 @@ public PuTTYSessionViewModel(Action<PuTTYSessionViewModel> saveCommand, Action<P`
`356`	`356`
`357`	`357`	`switch (_sessionInfo.ConnectionMode)`
`358`	`358`	`{`
	`359`	`+ // SSH is default`
`359`	`360`	`case ConnectionMode.SSH:`
`360`	`361`	`UseSSH = true;`
`361`	`362`	`break;`
`@@ -381,7 +382,7 @@ public PuTTYSessionViewModel(Action<PuTTYSessionViewModel> saveCommand, Action<P`
`381`	`382`	`else`
`382`	`383`	`{`
`383`	`384`	`Host = _sessionInfo.HostOrSerialLine;`
`384`		`- Port = _sessionInfo.PortOrBaud;`
	`385`	`+ Port = _sessionInfo.PortOrBaud == 0 ? SettingsManager.Current.PuTTY_SSHPort : _sessionInfo.PortOrBaud; // Default SSH port`
`385`	`386`	`}`
`386`	`387`
`387`	`388`	`Username = _sessionInfo.Username;`
`@@ -394,7 +395,7 @@ public PuTTYSessionViewModel(Action<PuTTYSessionViewModel> saveCommand, Action<P`
`394`	`395`
`395`	`396`	`_groups = CollectionViewSource.GetDefaultView(groups);`
`396`	`397`	`_groups.SortDescriptions.Add(new SortDescription());`
`397`		`-`
	`398`	`+`
`398`	`399`	`_isLoading = false;`
`399`	`400`	`}`
`400`	`401`
Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ private async void AddSessionAction()`
`255`	`255`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`
`256`	`256`	`ConfigurationManager.Current.FixAirspace = false;`
`257`	`257`
`258`		`- PuTTYSessionManager.AddSession(new Models.Settings.PuTTYSessionInfo(instance.Name, instance.ConnectionMode, instance.ConnectionMode == Models.PuTTY.PuTTY.ConnectionMode.Serial ? instance.SerialLine : instance.Host, instance.ConnectionMode == Models.PuTTY.PuTTY.ConnectionMode.Serial ? instance.Baud : instance.Port, instance.Username, instance.Profile, instance.AdditionalCommandLine, instance.Group, instance.Tags));`
	`258`	`+ PuTTYSessionManager.AddSession(new Models.Settings.PuTTYSessionInfo(instance.Name, instance.ConnectionMode, instance.ConnectionMode == PuTTY.ConnectionMode.Serial ? instance.SerialLine : instance.Host, instance.ConnectionMode == PuTTY.ConnectionMode.Serial ? instance.Baud : instance.Port, instance.Username, instance.Profile, instance.AdditionalCommandLine, instance.Group, instance.Tags));`
`259`	`259`	`}, instance =>`
`260`	`260`	`{`
`261`	`261`	`dialogCoordinator.HideMetroDialogAsync(this, customDialog);`