fix for the previous commit (we still need a space)

5 files changed, 21 insertions, 8 deletions

diff --git a/plugins/NewStory/src/history_array.cpp b/plugins/NewStory/src/history_array.cpp
index 87571efe9c..f622814d83 100644
--- a/plugins/NewStory/src/history_array.cpp
+++ b/plugins/NewStory/src/history_array.cpp
@@ -218,8 +218,11 @@ void HistoryArray::addChatEvent(SESSION_INFO *si, LOGINFO *lin)
 
 	CMStringW wszText;
 	bool bTextUsed = Chat_GetDefaultEventDescr(si, lin, wszText);
-	if (!bTextUsed && lin->ptszText)
+	if (!bTextUsed && lin->ptszText) {
+		if (!wszText.IsEmpty())
+			wszText.AppendChar(' ');
 		wszText.Append(g_chatApi.RemoveFormatting(lin->ptszText));
+	}
 
 	auto &p = allocateItem();
 	p.hContact = si->hContact;
diff --git a/plugins/TabSRMM/src/chat_log.cpp b/plugins/TabSRMM/src/chat_log.cpp
index 89559fd94d..e25c14e6fa 100644
--- a/plugins/TabSRMM/src/chat_log.cpp
+++ b/plugins/TabSRMM/src/chat_log.cpp
@@ -229,9 +229,11 @@ static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)
 	bool bTextUsed = Chat_GetDefaultEventDescr(streamData->si, streamData->lin, wszCaption);

 	if (!wszCaption.IsEmpty())

 		Log_AppendRTF(streamData, !bTextUsed, str, wszCaption);

-

-	if (!bTextUsed && streamData->lin->ptszText)

+	if (!bTextUsed && streamData->lin->ptszText) {

+		if (!wszCaption.IsEmpty())

+			Log_AppendRTF(streamData, false, str, L" ");

 		Log_AppendRTF(streamData, false, str, streamData->lin->ptszText);

+	}

 }

 

 char* Log_CreateRtfHeader(void)

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 010daf2a9d..c720434072 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -29,7 +29,7 @@
 

 #include "stdafx.h"

 

-#define IDI_CORE_LOAD 132 // icon id for the "connecting" icon

+#define IDI_CORE_LOAD	132					// icon id for the "connecting" icon

 

 static HANDLE hUserPrefsWindowLis = nullptr;

 HMODULE g_hMsftedit;

diff --git a/src/mir_app/src/chat_log.cpp b/src/mir_app/src/chat_log.cpp
index b4a140c570..582c7b4851 100644
--- a/src/mir_app/src/chat_log.cpp
+++ b/src/mir_app/src/chat_log.cpp
@@ -258,9 +258,11 @@ static void AddEventToBuffer(CMStringA &buf, LOGSTREAMDATA *streamData)
 	bool bTextUsed = Chat_GetDefaultEventDescr(streamData->si, streamData->lin, wszCaption);

 	if (!wszCaption.IsEmpty())

 		Log_AppendRTF(streamData, !bTextUsed, buf, wszCaption);

-

-	if (!bTextUsed && streamData->lin->ptszText)

+	if (!bTextUsed && streamData->lin->ptszText) {

+		if (!wszCaption.IsEmpty())

+			Log_AppendRTF(streamData, false, buf, L" ");

 		Log_AppendRTF(streamData, false, buf, streamData->lin->ptszText);

+	}

 }

 

 wchar_t* MakeTimeStamp(wchar_t *pszStamp, time_t time)

diff --git a/src/mir_app/src/chat_tools.cpp b/src/mir_app/src/chat_tools.cpp
index c8da42c41d..4c2bcc7698 100644
--- a/src/mir_app/src/chat_tools.cpp
+++ b/src/mir_app/src/chat_tools.cpp
@@ -348,8 +348,11 @@ BOOL DoPopup(SESSION_INFO *si, GCEVENT *gce)
 		break;

 	}

 

-	if (!bTextUsed && lin.ptszText)

+	if (!bTextUsed && lin.ptszText) {

+		if (!wszText.IsEmpty())

+			wszText.AppendChar(' ');

 		wszText.Append(RemoveFormatting(gce->pszText.w));

+	}

 

 	g_chatApi.ShowPopup(si->hContact, si, g_chatApi.getIcon(gce->iType), si->pszModule, si->ptszName, dwColor, L"%s", wszText.c_str());

 	return TRUE;

@@ -545,8 +548,11 @@ BOOL LogToFile(SESSION_INFO *si, GCEVENT *gce)
 		break;

 	}

 

-	if (!bTextUsed && lin.ptszText)

+	if (!bTextUsed && lin.ptszText) {

+		if (!buf.IsEmpty())

+			buf.AppendChar(' ');

 		buf.Append(RemoveFormatting(gce->pszText.w));

+	}

 

 	// formatting strings don't need to be translatable - changing them via language pack would

 	// only screw up the log format.