- Display startup release notes (eg post-r3921) to not block startup, preventing duplicate "Help" menus - with thanks to Michaël Gallego and schlabberdog

2 files changed, 5 insertions, 4 deletions

diff --git a/Source/SPPreferencesUpgrade.h b/Source/SPPreferencesUpgrade.h
index 71f6c956..e3de5cb7 100644
--- a/Source/SPPreferencesUpgrade.h
+++ b/Source/SPPreferencesUpgrade.h
@@ -42,6 +42,6 @@
 void SPApplyRevisionChanges(void);
 void SPMigrateConnectionFavoritesData(void);
 void SPMigratePreferencesFromPreviousIdentifer(void);
-void SPShowPostMigrationReleaseNotes(NSArray *releaseNotes);
++ (void)showPostMigrationReleaseNotes:(NSArray *)releaseNotes;
 
 @end
diff --git a/Source/SPPreferencesUpgrade.m b/Source/SPPreferencesUpgrade.m
index 63046ce6..3c709153 100644
--- a/Source/SPPreferencesUpgrade.m
+++ b/Source/SPPreferencesUpgrade.m
@@ -325,8 +325,9 @@ void SPApplyRevisionChanges(void)
 		[importantUpdateNotes addObject:NSLocalizedString(@"We've changed Sequel Pro's digital signature for GateKeeper compatibility; you'll have to allow access to your passwords again.", @"Short important release note for why password prompts may occur")];
 	}
 
-	// Display any important release notes, if any
-	SPShowPostMigrationReleaseNotes(importantUpdateNotes);
+	// Display any important release notes, if any.  Call this after a slight delay to prevent double help
+	// menus - see http://www.cocoabuilder.com/archive/cocoa/6200-two-help-menus-why.html .
+	[SPPreferencesUpgrade performSelector:@selector(showPostMigrationReleaseNotes:) withObject:importantUpdateNotes afterDelay:0.1];
 	[importantUpdateNotes release];
 
 	// Update the prefs revision
@@ -430,7 +431,7 @@ void SPMigratePreferencesFromPreviousIdentifer(void)
 /**
  * Displays important release notes for a new revision.
  */
-void SPShowPostMigrationReleaseNotes(NSArray *releaseNotes)
++ (void)showPostMigrationReleaseNotes:(NSArray *)releaseNotes
 {
 	if (![releaseNotes count]) {
 		return;