@@ -170,60 +170,64 @@ private void CheckForUpdates_Click(object sender, RoutedEventArgs e)
170170
171171 var json = JObject . Parse ( html ) ;
172172 var latest = json [ _appName ] [ "version" ] ? . ToString ( ) ;
173- if ( latest ! = null )
173+ if ( latest = = null )
174174 {
175- var numericVer = AboutVersionNumber . Text . Substring ( 0 , AboutVersionNumber . Text . IndexOf ( '-' ) ) ;
176- var cVer = Version . Parse ( numericVer ) ;
177- var lVer = Version . Parse ( latest ) ;
178-
179- // Reverse this sign to test
180- if ( cVer . CompareTo ( lVer ) < 0 )
175+ return ;
176+ }
177+ // Why isn't this just using the AssemblyVersion?!?!
178+ var dashPosition = AboutVersionNumber . Text . IndexOf ( '-' ) ;
179+ string numericVer ;
180+ numericVer = dashPosition >= 0 ? AboutVersionNumber . Text . Substring ( 0 , dashPosition ) : AboutVersionNumber . Text ;
181+ var cVer = Version . Parse ( numericVer ) ;
182+ var lVer = Version . Parse ( latest ) ;
183+
184+ // Reverse this sign to test
185+ if ( cVer . CompareTo ( lVer ) < 0 )
186+ {
187+ // Update available
188+ UpdateCheckStatus . Text = "Update Available! (" + DateTime . Now . ToString ( ) + ")" ;
189+ Hyperlink hyperlink = null ;
190+ try
181191 {
182- // Update available
183- UpdateCheckStatus . Text = "Update Available! (" + DateTime . Now . ToString ( ) + ")" ;
184- Hyperlink hyperlink = null ;
185- try
192+ var location = json [ _appName ] [ "location" ] ? . ToString ( ) ;
193+ if ( location != null )
186194 {
187- var location = json [ _appName ] [ "location" ] ? . ToString ( ) ;
188- if ( location != null )
195+ hyperlink = new Hyperlink ( new Run ( location ) )
189196 {
190- hyperlink = new Hyperlink ( new Run ( location ) )
191- {
192- NavigateUri = new Uri ( location ) ,
193- } ;
194- hyperlink . RequestNavigate += Hyperlink_RequestNavigate ;
195- UpdateCheckStatus . Text += "\n " ;
196- UpdateCheckStatus . Inlines . Add ( hyperlink ) ;
197- }
198- }
199- catch
200- {
201- // noop - there was an update, we just don't know where
197+ NavigateUri = new Uri ( location ) ,
198+ } ;
199+ hyperlink . RequestNavigate += Hyperlink_RequestNavigate ;
200+ UpdateCheckStatus . Text += "\n " ;
201+ UpdateCheckStatus . Inlines . Add ( hyperlink ) ;
202202 }
203+ }
204+ catch
205+ {
206+ // noop - there was an update, we just don't know where
207+ }
203208
204- if ( MessageBox . Show ( "A new buttplug update is available! Would you like to go to the update site?" ,
205- "Buttplug Update" ,
206- MessageBoxButton . YesNo ,
207- MessageBoxImage . Asterisk ) == MessageBoxResult . Yes )
208- {
209- hyperlink ? . DoClick ( ) ;
210- }
209+ if ( MessageBox . Show ( "A new buttplug update is available! Would you like to go to the update site?" ,
210+ "Buttplug Update" ,
211+ MessageBoxButton . YesNo ,
212+ MessageBoxImage . Asterisk ) == MessageBoxResult . Yes )
213+ {
214+ hyperlink ? . DoClick ( ) ;
215+ }
211216
212- try
213- {
214- ( ( TabControl ) ( ( TabItem ) Parent ) . Parent ) . SelectedItem = Parent ;
215- UpdateCheckStatus . Focus ( ) ;
216- }
217- catch
218- {
219- // noop - things went bang
220- }
217+ try
218+ {
219+ ( ( TabControl ) ( ( TabItem ) Parent ) . Parent ) . SelectedItem = Parent ;
220+ UpdateCheckStatus . Focus ( ) ;
221221 }
222- else
222+ catch
223223 {
224- UpdateCheckStatus . Text = "No new updates! (" + DateTime . Now . ToString ( ) + ")" ;
224+ // noop - things went bang
225225 }
226226 }
227+ else
228+ {
229+ UpdateCheckStatus . Text = "No new updates! (" + DateTime . Now . ToString ( ) + ")" ;
230+ }
227231 }
228232 catch ( Exception ex )
229233 {
0 commit comments