@@ -173,18 +173,16 @@ class BitmapDC
173
173
if (fontPath.size () > 0 )
174
174
{
175
175
_curFontPath = fontPath;
176
- std::thread ([fontPath, wnd = _wnd, this ]() {
177
- wchar_t * pwszBuffer = utf8ToUtf16 (fontPath);
178
- if (pwszBuffer)
176
+ wchar_t * pwszBuffer = utf8ToUtf16 (fontPath);
177
+ if (pwszBuffer)
178
+ {
179
+ if (AddFontResource (pwszBuffer))
179
180
{
180
- if (AddFontResource (pwszBuffer))
181
- {
182
- PostMessage (wnd, WM_FONTCHANGE, 0 , 0 );
183
- }
184
- delete[] pwszBuffer;
185
- pwszBuffer = nullptr ;
181
+ PostMessage (_wnd, WM_FONTCHANGE, 0 , 0 );
186
182
}
187
- }).detach ();
183
+ delete[] pwszBuffer;
184
+ pwszBuffer = nullptr ;
185
+ }
188
186
}
189
187
190
188
_font = nullptr ;
@@ -432,16 +430,14 @@ class BitmapDC
432
430
// release temp font resource
433
431
if (_curFontPath.size () > 0 )
434
432
{
435
- std::thread ([curFontPath = _curFontPath, wnd = _wnd, this ]() {
436
- wchar_t * pwszBuffer = utf8ToUtf16 (curFontPath);
437
- if (pwszBuffer)
438
- {
439
- RemoveFontResource (pwszBuffer);
440
- PostMessage (wnd, WM_FONTCHANGE, 0 , 0 );
441
- delete[] pwszBuffer;
442
- pwszBuffer = nullptr ;
443
- }
444
- }).detach ();
433
+ wchar_t * pwszBuffer = utf8ToUtf16 (_curFontPath);
434
+ if (pwszBuffer)
435
+ {
436
+ RemoveFontResource (pwszBuffer);
437
+ PostMessage (_wnd, WM_FONTCHANGE, 0 , 0 );
438
+ delete[] pwszBuffer;
439
+ pwszBuffer = nullptr ;
440
+ }
445
441
_curFontPath.clear ();
446
442
}
447
443
}
0 commit comments