From b02effdab9b837bd2197ffe7f7f26e0e49fe8acd Mon Sep 17 00:00:00 2001 From: Martin Renold Date: Sat, 8 Dec 2018 16:26:04 +0100 Subject: Fix crash if display resolution is not set (#7950) On my wayland / gnome3 setup DisplayHeightMM() returns 0. This resulted in a misleading startup error suggesting to fix my font paths. --- src/client/fontengine.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/client/fontengine.cpp') diff --git a/src/client/fontengine.cpp b/src/client/fontengine.cpp index dc98fb1e4..59e5bedee 100644 --- a/src/client/fontengine.cpp +++ b/src/client/fontengine.cpp @@ -315,6 +315,11 @@ void FontEngine::initFont(unsigned int basesize, FontMode mode) } u32 size = std::floor(RenderingEngine::getDisplayDensity() * m_settings->getFloat("gui_scaling") * basesize); + if (size == 0) { + errorstream << "FontEngine: attempt to use font size 0" << std::endl; + errorstream << " display density: " << RenderingEngine::getDisplayDensity() << std::endl; + abort(); + } u32 font_shadow = 0; u32 font_shadow_alpha = 0; -- cgit v1.2.3