From f078945343dd99ff5bb83836bc87d77f1a85d32d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 8 Aug 2023 13:20:37 +0300 Subject: occasional crash fix --- libs/mTextControl/src/services.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libs/mTextControl/src') diff --git a/libs/mTextControl/src/services.cpp b/libs/mTextControl/src/services.cpp index b38ef88367..310c2863dd 100644 --- a/libs/mTextControl/src/services.cpp +++ b/libs/mTextControl/src/services.cpp @@ -115,7 +115,8 @@ MTEXTCONTROL_DLL(TextObject *) MTextCreateEx(HANDLE userHandle, void *text, uint MTEXTCONTROL_DLL(int) MTextMeasure(HDC dc, SIZE *sz, TextObject *text) { - if (!text) return 0; + if (!text || !dc) + return 0; long lWidth = sz->cx, lHeight = sz->cy; text->ftd->get_NaturalSize(dc, &lWidth, &lHeight); @@ -129,7 +130,8 @@ MTEXTCONTROL_DLL(int) MTextMeasure(HDC dc, SIZE *sz, TextObject *text) MTEXTCONTROL_DLL(int) MTextDisplay(HDC dc, POINT pos, SIZE sz, TextObject *text) { - if (!text) return 0; + if (!text || !dc) + return 0; COLORREF cl = GetTextColor(dc); -- cgit v1.2.3