fix: Fix ArgumentOutOfBoundException in updater

Don't rely on presence of hyphen for version parsing. Fixes#289

Author: qdot

Buttplug.Components.Controls/ButtplugAboutControl.xaml.cs

@@ -170,60 +170,64 @@ private void CheckForUpdates_Click(object sender, RoutedEventArgs e)
 
 varjson=JObject.Parse(html);
 varlatest=json[_appName]["version"]?.ToString();
-if(latest!=null)
+if(latest==null)
 {
-varnumericVer=AboutVersionNumber.Text.Substring(0,AboutVersionNumber.Text.IndexOf('-'));
-varcVer=Version.Parse(numericVer);
-varlVer=Version.Parse(latest);
-
-// Reverse this sign to test
-if(cVer.CompareTo(lVer)<0)
+return;
+}
+// Why isn't this just using the AssemblyVersion?!?!
+vardashPosition=AboutVersionNumber.Text.IndexOf('-');
+stringnumericVer;
+numericVer=dashPosition>=0?AboutVersionNumber.Text.Substring(0,dashPosition):AboutVersionNumber.Text;
+varcVer=Version.Parse(numericVer);
+varlVer=Version.Parse(latest);
+
+// Reverse this sign to test
+if(cVer.CompareTo(lVer)<0)
+{
+// Update available
+UpdateCheckStatus.Text="Update Available! ("+DateTime.Now.ToString()+")";
+Hyperlinkhyperlink=null;
+try
 {
-// Update available
-UpdateCheckStatus.Text="Update Available! ("+DateTime.Now.ToString()+")";
-Hyperlinkhyperlink=null;
-try
+varlocation=json[_appName]["location"]?.ToString();
+if(location!=null)
 {
-varlocation=json[_appName]["location"]?.ToString();
-if(location!=null)
+hyperlink=newHyperlink(newRun(location))
 {
-hyperlink=newHyperlink(newRun(location))
-{
-NavigateUri=newUri(location),
-};
-hyperlink.RequestNavigate+=Hyperlink_RequestNavigate;
-UpdateCheckStatus.Text+="\n";
-UpdateCheckStatus.Inlines.Add(hyperlink);
-}
-}
-catch
-{
-// noop - there was an update, we just don't know where
+NavigateUri=newUri(location),
+};
+hyperlink.RequestNavigate+=Hyperlink_RequestNavigate;
+UpdateCheckStatus.Text+="\n";
+UpdateCheckStatus.Inlines.Add(hyperlink);
 }
+}
+catch
+{
+// noop - there was an update, we just don't know where
+}
 
-if(MessageBox.Show("A new buttplug update is available! Would you like to go to the update site?",
-"Buttplug Update",
-MessageBoxButton.YesNo,
-MessageBoxImage.Asterisk)==MessageBoxResult.Yes)
-{
-hyperlink?.DoClick();
-}
+if(MessageBox.Show("A new buttplug update is available! Would you like to go to the update site?",
+"Buttplug Update",
+MessageBoxButton.YesNo,
+MessageBoxImage.Asterisk)==MessageBoxResult.Yes)
+{
+hyperlink?.DoClick();
+}
 
-try
-{
-((TabControl)((TabItem)Parent).Parent).SelectedItem=Parent;
-UpdateCheckStatus.Focus();
-}
-catch
-{
-// noop - things went bang
-}
+try
+{
+((TabControl)((TabItem)Parent).Parent).SelectedItem=Parent;
+UpdateCheckStatus.Focus();
 }
-else
+catch
 {
-UpdateCheckStatus.Text="No new updates! ("+DateTime.Now.ToString()+")";
+// noop - things went bang
 }
 }
+else
+{
+UpdateCheckStatus.Text="No new updates! ("+DateTime.Now.ToString()+")";
+}
 }
 catch(Exceptionex)
 {

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.1.2 (2017-09-15)
+
+## Bugfixes
+
+- Fix ArgumentOutOfBoundsException in updater
+
 # 0.1.1 (2017-09-15)
 
 ## Features