From 2b5c7de9655edcf3269bdc67191cfbe90d5514a7 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 22 Sep 2018 00:21:31 +0200 Subject: [PATCH] Avoid crash in +/- font size by setting style sheet to "" --- src/blackgui/menus/fontmenus.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/blackgui/menus/fontmenus.cpp b/src/blackgui/menus/fontmenus.cpp index 5f46bdca4..8992e86af 100644 --- a/src/blackgui/menus/fontmenus.cpp +++ b/src/blackgui/menus/fontmenus.cpp @@ -78,22 +78,21 @@ namespace BlackGui void CFontMenu::fontSizePlus() { - Q_ASSERT_X(m_widget, Q_FUNC_INFO, "No widget"); + if (!m_widget) { return; } const int pt = m_widget->font().pointSize() + 1; if (pt > 24) { return; } - m_widget->setStyleSheet( - CStyleSheetUtility::asStylesheet(m_widget, pt) - ); + + m_widget->setStyleSheet(""); // avoid Qt crash + m_widget->setStyleSheet(CStyleSheetUtility::asStylesheet(m_widget, pt)); } void CFontMenu::fontSizeMinus() { - Q_ASSERT_X(m_widget, Q_FUNC_INFO, "No widget"); + if (!m_widget) { return; } const int pt = m_widget->font().pointSize() - 1; if (pt < 5) { return; } - m_widget->setStyleSheet( - CStyleSheetUtility::asStylesheet(m_widget, pt) - ); + m_widget->setStyleSheet(""); // avoid Qt crash + m_widget->setStyleSheet(CStyleSheetUtility::asStylesheet(m_widget, pt)); } void CFontMenu::fontReset()