Fix toggling of 'misc' font options (bug #8764)

diff --git a/src/frontends/qt4/GuiCharacter.cpp b/src/frontends/qt4/GuiCharacter.cpp
index e1fe98491c12343c6649b192753eaf6c55674dae..2d2c3e2b7ef679001320285b3a2fb88ed652685a 100644 (file)
--- a/src/frontends/qt4/GuiCharacter.cpp
+++ b/src/frontends/qt4/GuiCharacter.cpp
@@ -307,30 +307,38 @@ static void setBar(FontInfo & fi, FontState val)
                fi.setEmph(FONT_IGNORE);
                fi.setUnderbar(FONT_IGNORE);
                fi.setStrikeout(FONT_IGNORE);
+               fi.setUuline(FONT_IGNORE);
+               fi.setUwave(FONT_IGNORE);
                fi.setNoun(FONT_IGNORE);
                break;
 
        case EMPH_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setEmph(FONT_TOGGLE);
                break;
 
        case UNDERBAR_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setUnderbar(FONT_TOGGLE);
                break;
 
        case STRIKEOUT_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setStrikeout(FONT_TOGGLE);
                break;
 
        case UULINE_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setUuline(FONT_TOGGLE);
                break;
 
        case UWAVE_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setUwave(FONT_TOGGLE);
                break;
 
        case NOUN_TOGGLE:
+               setBar(fi, INHERIT);
                fi.setNoun(FONT_TOGGLE);
                break;