commit 254affa0b9232533daaed1301e194a0b7726c777
Author: Juergen Spitzmueller <[email protected]>
Date: Fri Dec 28 17:25:53 2018 +0100
Fix regression introduced in a65f1e54dc
---
src/frontends/qt4/GuiToolbar.cpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 8d63866..939ea7f 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -368,8 +368,8 @@ void DynamicMenuButton::updateTriggered()
} else if (menutype == "textstyle-apply") {
m->clear();
setPopupMode(QToolButton::MenuButtonPopup);
- QToolButton::setIcon(getIcon(FuncRequest(LFUN_TEXTSTYLE_APPLY),
false));
if (!bv) {
+
QToolButton::setIcon(getIcon(FuncRequest(LFUN_TEXTSTYLE_APPLY), false));
setEnabled(false);
return;
}
@@ -396,6 +396,7 @@ void DynamicMenuButton::updateTriggered()
m->addAction(reset_act);
if (default_act)
QToolButton::setDefaultAction(default_act);
+ QToolButton::setIcon(getIcon(FuncRequest(LFUN_TEXTSTYLE_APPLY),
false));
setEnabled(lyx::getStatus(FuncRequest(LFUN_TEXTSTYLE_APPLY)).enabled()
||
lyx::getStatus(FuncRequest(LFUN_FONT_DEFAULT)).enabled());
} else if (menutype == "paste") {