diff --git a/src/MacVim/MMAppController.m b/src/MacVim/MMAppController.m index 339c5bd279..f33fcaca19 100644 --- a/src/MacVim/MMAppController.m +++ b/src/MacVim/MMAppController.m @@ -504,8 +504,8 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification NSArray *currentVersionItems = [currentVersion componentsSeparatedByString:@"."]; // Compare two arrays lexographically. We just assume that version // numbers are also X.Y.Z… with no "beta" etc texts. - bool currentVersionLarger = NO; - for (int i = 0; i < currentVersionItems.count && i < lastUsedVersionItems.count; i++) { + BOOL currentVersionLarger = NO; + for (int i = 0; i < currentVersionItems.count || i < lastUsedVersionItems.count; i++) { if (i >= currentVersionItems.count) { currentVersionLarger = NO; break; @@ -527,18 +527,14 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification if (currentVersionLarger) { [ud setValue:currentVersion forKey:MMLastUsedBundleVersionKey]; - // We have successfully updated to a new version. Show a "What's - // New" page to the user with latest release notes if the main - // release number has increased (we don't count the pre-release - // minor revision number for now). - if (lastUsedVersionItems[0].integerValue < currentVersionItems[0].integerValue) { + // We have successfully updated to a new version. Show a + // "What's New" page to the user with latest release notes + // unless they configured not to. + BOOL showWhatsNewSetting = [ud boolForKey:MMShowWhatsNewOnStartupKey]; - BOOL showWhatsNewSetting = [ud boolForKey:MMShowWhatsNewOnStartupKey]; - - shouldShowWhatsNewPage = showWhatsNewSetting; - [MMWhatsNewController setRequestVersionRange:lastUsedVersion - to:currentVersion]; - } + shouldShowWhatsNewPage = showWhatsNewSetting; + [MMWhatsNewController setRequestVersionRange:lastUsedVersion + to:currentVersion]; } } } diff --git a/src/MacVim/MMWhatsNewController.m b/src/MacVim/MMWhatsNewController.m index 976db2c16d..150c22272c 100644 --- a/src/MacVim/MMWhatsNewController.m +++ b/src/MacVim/MMWhatsNewController.m @@ -83,8 +83,7 @@ - (id)init _latestVersion]; } else { - // We just updated to a new version. Show a message to user and also - // requests specifically these new versions for the welcome message + // Just show the current version MacVim has NSString *currentVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleVersion"]; whatsNewURLStr = [NSString stringWithFormat:@"%@?version=%@",