diff --git a/src/detection/font/font_linux.c b/src/detection/font/font_linux.c index ae2f03331..1e51116f3 100644 --- a/src/detection/font/font_linux.c +++ b/src/detection/font/font_linux.c @@ -1,9 +1,18 @@ #include "common/font.h" +#include "detection/displayserver/displayserver.h" #include "detection/gtk_qt/gtk_qt.h" #include "font.h" void ffDetectFontImpl(const FFinstance* instance, FFFontResult* result) { + const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance); + + if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, FF_WM_PROTOCOL_TTY) == 0) + { + ffStrbufAppendS(&result->error, "Font isn't supported in TTY"); + return; + } + FFfont qt; ffFontInitQt(&qt, ffDetectQt(instance)->font.chars); ffStrbufAppend(&result->fonts[0], &qt.pretty); diff --git a/src/modules/font.c b/src/modules/font.c index 29d3fac15..3d6f91e37 100644 --- a/src/modules/font.c +++ b/src/modules/font.c @@ -75,14 +75,6 @@ void ffPrintFont(FFinstance* instance) { assert(FF_DETECT_FONT_NUM_FONTS == FF_FONT_NUM_FORMAT_ARGS); - const FFDisplayServerResult* wmde = ffConnectDisplayServer(instance); - - if(ffStrbufIgnCaseCompS(&wmde->wmProtocolName, FF_WM_PROTOCOL_TTY) == 0) - { - ffPrintError(instance, FF_FONT_MODULE_NAME, 0, &instance->config.font, "Font isn't supported in TTY"); - return; - } - const FFFontResult* font = ffDetectFont(instance); if(font->error.length > 0)