added locks around cTextWrappers to avoid crashed when concurrently accessing fonts

This commit is contained in:
louis
2015-04-06 09:58:33 +02:00
parent f316b2628a
commit d70bfe7091
4 changed files with 25 additions and 1 deletions

View File

@@ -51,8 +51,10 @@ int Minimum(int a, int b, int c, int d, int e, int f) {
string CutText(string &text, int width, string fontName, int fontSize) {
if (width <= fontManager->Font(fontName, fontSize)->Size())
return text.c_str();
fontManager->Lock();
cTextWrapper twText;
twText.Set(text.c_str(), fontManager->Font(fontName, fontSize), width);
fontManager->Unlock();
string cuttedTextNative = twText.GetLine(0);
stringstream sstrText;
sstrText << cuttedTextNative << "...";