Merge branch 'tf/LH-37v2/ScintillaEditView-hotspotstyle-memory-leak'

* tf/LH-37v2/ScintillaEditView-hotspotstyle-memory-leak:
  ScintillaEditView.cpp: fix createHotSpotFromStyle mem leak

PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp

@@ -2821,24 +2821,17 @@ void ScintillaEditView::createHotSpotFromStyle(Style& out_hotspot, int idStyleFr
 	// Joce: HACK HACK HACK HACK HACK :-/
 	// nativeLangEncoding should be made part of WcharMbcsConvertor
 	static int nativeLangEncodingCopy = -1;
-	if (nativeLangEncodingCopy >= 0 && nativeLangEncodingCopy != nativeLangEncoding)
+	if (nativeLangEncoding >= 0 && nativeLangEncodingCopy != nativeLangEncoding)
 	{
 		nativeLangEncodingCopy = nativeLangEncoding;
 	}
 	// End HACK
 
 	char fontNameA[128];
-
 	execute(SCI_STYLEGETFONT, idStyleFrom, (LPARAM)fontNameA);
-	TCHAR *generic_fontname = new TCHAR[128];
-#ifdef UNICODE
+
 	WcharMbcsConvertor *wmc = WcharMbcsConvertor::getInstance();
-	const wchar_t * fontNameW = wmc->char2wchar(fontNameA, nativeLangEncodingCopy);
-	lstrcpy(generic_fontname, fontNameW);
-#else
-	lstrcpy(generic_fontname, fontNameA);
-#endif
-	out_hotspot._fontName = generic_fontname;
+	out_hotspot._fontName = wmc->char2wchar(fontNameA, nativeLangEncodingCopy);
 
 	out_hotspot._fgColor = execute(SCI_STYLEGETFORE, idStyleFrom);
 	out_hotspot._bgColor = execute(SCI_STYLEGETBACK, idStyleFrom);