Skip to content

Commit 632a864

Browse files
committed
#3892 Crash at fillCompositionLogfont
1 parent df1c018 commit 632a864

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

indra/llwindow/llwindowwin32.cpp

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4040,7 +4040,15 @@ void LLWindowWin32::fillCompositionLogfont(LOGFONT *logfont)
40404040
break;
40414041
}
40424042

4043-
logfont->lfHeight = mPreeditor->getPreeditFontSize();
4043+
if (mPreeditor)
4044+
{
4045+
logfont->lfHeight = mPreeditor->getPreeditFontSize();
4046+
}
4047+
else
4048+
{
4049+
// todo: extract from some font * LLUI::getScaleFactor() intead
4050+
logfont->lfHeight = 10;
4051+
}
40444052
logfont->lfWeight = FW_NORMAL;
40454053
}
40464054

0 commit comments

Comments
 (0)