1.1 --- a/core/UserMessages.cpp	Wed Jan 23 18:28:06 2013 -0500
     1.2 +++ b/core/UserMessages.cpp	Sat Jan 26 12:14:40 2013 -0500
     1.3 @@ -262,7 +262,14 @@
     1.4  		m_FakeEngineBuffer = g_Cstrike15UsermessageHelpers.GetPrototype(msg_id)->New();
     1.5  		buffer = m_FakeEngineBuffer;
     1.6  	} else {
     1.7 -		protobuf::Message *msg = OnStartMessage_Pre(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id));
     1.8 +		char messageName[32];
     1.9 +		if (!GetMessageName(msg_id, messageName, sizeof(messageName)))
    1.10 +		{
    1.11 +			m_InExec = false;
    1.12 +			return NULL;
    1.13 +		}
    1.14 +
    1.15 +		protobuf::Message *msg = OnStartMessage_Pre(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, messageName);
    1.16  		switch (m_FakeMetaRes)
    1.17  		{
    1.18  		case MRES_IGNORED:
    1.19 @@ -279,7 +286,7 @@
    1.20  			break;
    1.21  		}
    1.22  		
    1.23 -		OnStartMessage_Post(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, g_SMAPI->GetUserMessage(msg_id));
    1.24 +		OnStartMessage_Post(static_cast<IRecipientFilter *>(&m_CellRecFilter), msg_id, messageName);
    1.25  	}
    1.26  
    1.27  	return buffer;