diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2025-04-08 23:34:09 +0300 | 
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2025-04-08 23:38:30 +0300 | 
| commit | 632a8648ca5456448499a96dcc58c40f4ff80d95 (patch) | |
| tree | 1f7d8f94a2c2f7ff65918b5bd9270e2fcaac09a3 | |
| parent | df1c018bed2758e49495e6bc02bd75445bfb0bcf (diff) | |
#3892 Crash at fillCompositionLogfont
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 10 | 
1 files changed, 9 insertions, 1 deletions
| diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 832cf254d1..1cac6ffe08 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -4040,7 +4040,15 @@ void LLWindowWin32::fillCompositionLogfont(LOGFONT *logfont)          break;      } -    logfont->lfHeight = mPreeditor->getPreeditFontSize(); +    if (mPreeditor) +    { +        logfont->lfHeight = mPreeditor->getPreeditFontSize(); +    } +    else +    { +        // todo: extract from some font * LLUI::getScaleFactor() intead +        logfont->lfHeight = 10; +    }      logfont->lfWeight = FW_NORMAL;  } | 
