Merge branch 'develop'

lanayotech · Feb 20, 2016 · 169ce89 · 169ce89
2 parents dadb0fc + 452959d
commit 169ce89
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/Vagrant Manager/Util.m b/Vagrant Manager/Util.m
@@ -30,10 +30,20 @@ + (NSString*)trimTrailingSlash:(NSString*)path {
 }
 
 + (NSComparisonResult)compareVersion:(NSString*)version1 toVersion:(NSString*)version2 {
+    if(!version1 || !version2) {
+        //if either version is nil, don't upgrade
+        return NSOrderedDescending;
+    }
+
     return [self compareVersion:version1 toVersion:version2 skipExpansion:NO];
 }
 
 + (NSComparisonResult)compareVersion:(NSString*)version1 toVersion:(NSString*)version2 skipExpansion:(BOOL)skipExpansion {
+    if(!version1 || !version2) {
+        //if either version is nil, don't upgrade
+        return NSOrderedDescending;
+    }
+
     NSMutableArray *version1parts = [[version1 componentsSeparatedByString:@"."] mutableCopy];
     NSMutableArray *version2parts = [[version2 componentsSeparatedByString:@"."] mutableCopy];
 

diff --git a/Vagrant Manager/Vagrant Manager-Info.plist b/Vagrant Manager/Vagrant Manager-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.5.2</string>
+	<string>2.5.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.5.2</string>
+	<string>2.5.3</string>
 	<key>Configuration</key>
 	<string>${CONFIGURATION}</string>
 	<key>LSApplicationCategoryType</key>