adium 4855:90ccc4c599df: Merged

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/90ccc4c599df
revision:	4855:90ccc4c599df
branch:		(none)
author:		Thijs Alkemade <thijsalkemade at gmail.com>
date:		Fri Jun 08 13:23:08 2012 +0200

Merged

diffs (16 lines):

diff -r 0a50dcf69274 -r 90ccc4c599df Plugins/Send Message Contact Alert/ESSendMessageContactAlertPlugin.m
--- a/Plugins/Send Message Contact Alert/ESSendMessageContactAlertPlugin.m	Fri Jun 08 12:53:55 2012 +0200
+++ b/Plugins/Send Message Contact Alert/ESSendMessageContactAlertPlugin.m	Fri Jun 08 13:23:08 2012 +0200
@@ -106,6 +106,12 @@
 
 	destUniqueID = [details objectForKey:KEY_MESSAGE_SEND_TO];
 	if (destUniqueID) contact = (AIListContact *)[adium.contactController existingListObjectWithUniqueID:destUniqueID];
+	
+	/* I'm not sure how this can actually end up here, but apparently if the user has 2 or more accounts, one
+	 * with a pending message for a meta-contact on 2 accounts, and the other connects first, this event will
+	 * fire, but contact will be nil. (#15787).
+	 */
+	if (!contact) return FALSE;
 
 	//Message to send and other options
 	useAnotherAccount = [[details objectForKey:KEY_MESSAGE_OTHER_ACCOUNT] boolValue];