Close #87 and fixed another NullReferenceException

BornToBeRoot · BornToBeRoot · commit 83b94d33e72d · 2018-06-05T20:09:47.000+02:00
diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -455,7 +455,7 @@ public bool IPScanner_UseCustomDNSServer
             }
         }
 
-        private List<string> _ipScanner_CustomDNSServer;
+        private List<string> _ipScanner_CustomDNSServer = new List<string>();
         public List<string> IPScanner_CustomDNSServer
         {
             get { return _ipScanner_CustomDNSServer; }
@@ -977,7 +977,7 @@ public bool Ping_ShowStatistics
         #endregion
 
         #region Traceroute
-        private ObservableCollection<string> _traceroute_HostHistory;
+        private ObservableCollection<string> _traceroute_HostHistory = new ObservableCollection<string>();
         public ObservableCollection<string> Traceroute_HostHistory
         {
             get { return _traceroute_HostHistory; }
@@ -1153,7 +1153,7 @@ public bool DNSLookup_UseCustomDNSServer
             }
         }
 
-        private List<string> _dnsLookup_CustomDNSServer;
+        private List<string> _dnsLookup_CustomDNSServer = new List<string>();
         public List<string> DNSLookup_CustomDNSServer
         {
             get { return _dnsLookup_CustomDNSServer; }
@@ -2173,7 +2173,7 @@ public bool HTTPHeaders_ShowStatistics
         #endregion
 
         #region Subnet Calculator
-        #region IPv4 Calculator
+        #region Calculator
         private ObservableCollection<string> _subnetCalculator_IPv4Calculator_SubnetHistory = new ObservableCollection<string>();
         public ObservableCollection<string> SubnetCalculator_IPv4Calculator_SubnetHistory
         {
@@ -2189,9 +2189,9 @@ public ObservableCollection<string> SubnetCalculator_IPv4Calculator_SubnetHistor
         }
         #endregion
 
-        #region IPv4 Splitter
-        private List<string> _subnetCalculator_IPv4Splitter_SubnetHistory = new List<string>();
-        public List<string> SubnetCalculator_IPv4Splitter_SubnetHistory
+        #region Splitter
+        private ObservableCollection<string> _subnetCalculator_IPv4Splitter_SubnetHistory = new ObservableCollection<string>();
+        public ObservableCollection<string> SubnetCalculator_IPv4Splitter_SubnetHistory
         {
             get { return _subnetCalculator_IPv4Splitter_SubnetHistory; }
             set
@@ -2204,8 +2204,8 @@ public List<string> SubnetCalculator_IPv4Splitter_SubnetHistory
             }
         }
 
-        private List<string> _subnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory = new List<string>();
-        public List<string> SubnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory
+        private ObservableCollection<string> _subnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory = new ObservableCollection<string>();
+        public ObservableCollection<string> SubnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory
         {
             get { return _subnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory; }
             set
diff --git a/Source/NETworkManager/ViewModels/SubnetCalculatorIPv4SplitterViewModel.cs b/Source/NETworkManager/ViewModels/SubnetCalculatorIPv4SplitterViewModel.cs
@@ -89,7 +89,6 @@ public bool CancelSplit
             }
         }
 
-
         private ObservableCollection<SubnetInfo> _splitResult = new ObservableCollection<SubnetInfo>();
         public ObservableCollection<SubnetInfo> SplitResult
         {

Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,7 @@ public bool IPScanner_UseCustomDNSServer`
`455`	`455`	`}`
`456`	`456`	`}`
`457`	`457`
`458`		`- private List<string> _ipScanner_CustomDNSServer;`
	`458`	`+ private List<string> _ipScanner_CustomDNSServer = new List<string>();`
`459`	`459`	`public List<string> IPScanner_CustomDNSServer`
`460`	`460`	`{`
`461`	`461`	`get { return _ipScanner_CustomDNSServer; }`
`@@ -977,7 +977,7 @@ public bool Ping_ShowStatistics`
`977`	`977`	`#endregion`
`978`	`978`
`979`	`979`	`#region Traceroute`
`980`		`- private ObservableCollection<string> _traceroute_HostHistory;`
	`980`	`+ private ObservableCollection<string> _traceroute_HostHistory = new ObservableCollection<string>();`
`981`	`981`	`public ObservableCollection<string> Traceroute_HostHistory`
`982`	`982`	`{`
`983`	`983`	`get { return _traceroute_HostHistory; }`
`@@ -1153,7 +1153,7 @@ public bool DNSLookup_UseCustomDNSServer`
`1153`	`1153`	`}`
`1154`	`1154`	`}`
`1155`	`1155`
`1156`		`- private List<string> _dnsLookup_CustomDNSServer;`
	`1156`	`+ private List<string> _dnsLookup_CustomDNSServer = new List<string>();`
`1157`	`1157`	`public List<string> DNSLookup_CustomDNSServer`
`1158`	`1158`	`{`
`1159`	`1159`	`get { return _dnsLookup_CustomDNSServer; }`
`@@ -2173,7 +2173,7 @@ public bool HTTPHeaders_ShowStatistics`
`2173`	`2173`	`#endregion`
`2174`	`2174`
`2175`	`2175`	`#region Subnet Calculator`
`2176`		`- #region IPv4 Calculator`
	`2176`	`+ #region Calculator`
`2177`	`2177`	`private ObservableCollection<string> _subnetCalculator_IPv4Calculator_SubnetHistory = new ObservableCollection<string>();`
`2178`	`2178`	`public ObservableCollection<string> SubnetCalculator_IPv4Calculator_SubnetHistory`
`2179`	`2179`	`{`
`@@ -2189,9 +2189,9 @@ public ObservableCollection<string> SubnetCalculator_IPv4Calculator_SubnetHistor`
`2189`	`2189`	`}`
`2190`	`2190`	`#endregion`
`2191`	`2191`
`2192`		`- #region IPv4 Splitter`
`2193`		`- private List<string> _subnetCalculator_IPv4Splitter_SubnetHistory = new List<string>();`
`2194`		`- public List<string> SubnetCalculator_IPv4Splitter_SubnetHistory`
	`2192`	`+ #region Splitter`
	`2193`	`+ private ObservableCollection<string> _subnetCalculator_IPv4Splitter_SubnetHistory = new ObservableCollection<string>();`
	`2194`	`+ public ObservableCollection<string> SubnetCalculator_IPv4Splitter_SubnetHistory`
`2195`	`2195`	`{`
`2196`	`2196`	`get { return _subnetCalculator_IPv4Splitter_SubnetHistory; }`
`2197`	`2197`	`set`
`@@ -2204,8 +2204,8 @@ public List<string> SubnetCalculator_IPv4Splitter_SubnetHistory`
`2204`	`2204`	`}`
`2205`	`2205`	`}`
`2206`	`2206`
`2207`		`- private List<string> _subnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory = new List<string>();`
`2208`		`- public List<string> SubnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory`
	`2207`	`+ private ObservableCollection<string> _subnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory = new ObservableCollection<string>();`
	`2208`	`+ public ObservableCollection<string> SubnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory`
`2209`	`2209`	`{`
`2210`	`2210`	`get { return _subnetCalculator_IPv4Splitter_NewSubnetmaskOrCIDRHistory; }`
`2211`	`2211`	`set`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ public bool CancelSplit`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`		`-`
`93`	`92`	`private ObservableCollection<SubnetInfo> _splitResult = new ObservableCollection<SubnetInfo>();`
`94`	`93`	`public ObservableCollection<SubnetInfo> SplitResult`
`95`	`94`	`{`