From 10a09ce7de1c3b87a99db2089399246fb44b71b4 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 29 Aug 2018 13:21:48 +0300
Subject: fix for more friendly conversion of file transfer events into text

---
 src/mir_app/src/db_events.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mir_app/src/db_events.cpp b/src/mir_app/src/db_events.cpp
index fb1dd02cb6..827069de90 100644
--- a/src/mir_app/src/db_events.cpp
+++ b/src/mir_app/src/db_events.cpp
@@ -166,12 +166,17 @@ static INT_PTR DbEventGetTextWorker(DBEVENTINFO *dbei, int codepage, int datatyp
 		char *buf = LPSTR(dbei->pBlob) + sizeof(DWORD);
 		ptrW tszFileName(getEventString(dbei, buf));
 		ptrW tszDescription(getEventString(dbei, buf));
-		ptrW &ptszText = (mir_wstrlen(tszDescription) == 0) ? tszFileName : tszDescription;
+		CMStringW wszText(tszFileName);
+		if (mir_wstrlen(tszDescription) > 0) {
+			wszText.Append(L": ");
+			wszText.Append(tszDescription);
+		}
+		
 		switch (datatype) {
 		case DBVT_WCHAR:
-			return (INT_PTR)ptszText.detach();
+			return (INT_PTR)wszText.Detach();
 		case DBVT_ASCIIZ:
-			return (INT_PTR)mir_u2a(ptszText);
+			return (INT_PTR)mir_u2a(wszText);
 		}
 		return 0;
 	}
-- 
cgit v1.2.3