summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libs/mTextControl/src/services.cpp6
1 files changed, 4 insertions, 2 deletions
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);