From 3c633af365c16b7dfef47a4cd3218ccd93b9b2da Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 6 Aug 2019 11:23:31 +0200 Subject: [PATCH] Check for NULL icon --- src/blackgui/guiapplication.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/blackgui/guiapplication.cpp b/src/blackgui/guiapplication.cpp index 39963540e..85e9bf84a 100644 --- a/src/blackgui/guiapplication.cpp +++ b/src/blackgui/guiapplication.cpp @@ -826,8 +826,10 @@ namespace BlackGui QPointer w = CGuiApplication::mainApplicationWidget(); if (!w) { return; } const QSize iconSize = CIcons::empty16().size(); + static QPixmap iconEmpty; + QPixmap icon = w->style()->standardIcon(QStyle::SP_TitleBarMaxButton).pixmap(iconSize); - QAction *a = menu.addAction(icon.scaled(iconSize), "Fullscreen"); + QAction *a = menu.addAction(icon.isNull() ? iconEmpty : icon.scaled(iconSize), "Fullscreen"); bool c = connect(a, &QAction::triggered, this, [ = ]() { if (!w) { return; } @@ -836,7 +838,7 @@ namespace BlackGui Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); icon = w->style()->standardIcon(QStyle::SP_TitleBarMinButton).pixmap(iconSize); - a = menu.addAction(icon.scaled(iconSize), "Minimize"); + a = menu.addAction(icon.isNull() ? iconEmpty : icon.scaled(iconSize), "Minimize"); c = connect(a, &QAction::triggered, this, [ = ]() { if (!w) { return; } @@ -845,7 +847,7 @@ namespace BlackGui Q_ASSERT_X(c, Q_FUNC_INFO, "Connect failed"); icon = w->style()->standardIcon(QStyle::SP_TitleBarNormalButton).pixmap(iconSize); - a = menu.addAction(icon.scaled(iconSize), "Normal"); + a = menu.addAction(icon.isNull() ? iconEmpty : icon.scaled(iconSize), "Normal"); c = connect(a, &QAction::triggered, this, [ = ]() { if (!w) { return; }