Merge in a number of fixes from trunk (r2065, r2066, r2067, r2068, r2069, r2074, r2075, r2076, r2078, r2079, r2081, r2083, r2084, r2085, r2089, r2090, r2100, r2110, r2117, r2118, r2119, r2120, r2128, r2132, r2133, r2134, r2137, r2138, r2139, r2140, r2142, r2150, r2152, r2153, r2154, r2155, r2158, and r2160)

1 files changed, 8 insertions, 0 deletions

diff --git a/Source/SPGrowlController.m b/Source/SPGrowlController.m
index 91690546..a92dbdda 100644
--- a/Source/SPGrowlController.m
+++ b/Source/SPGrowlController.m
@@ -25,6 +25,7 @@
 
 #import "SPGrowlController.h"
 #import "SPConstants.h"
+#import "SPMainThreadTrampoline.h"
 
 #include <mach/mach_time.h>
 
@@ -88,6 +89,13 @@ static SPGrowlController *sharedGrowlController = nil;
  */
 - (void)notifyWithTitle:(NSString *)title description:(NSString *)description window:(NSWindow *)window notificationName:(NSString *)name
 {
+
+	// Ensure that the delayed notification call is made on the main thread
+	if (![NSThread isMainThread]) {
+		[[self onMainThread] notifyWithTitle:title description:description window:window notificationName:name];
+		return;
+	}
+
 	NSMutableDictionary *notificationDictionary = [NSMutableDictionary dictionary];
 	[notificationDictionary setObject:title forKey:@"title"];
 	[notificationDictionary setObject:description forKey:@"description"];