X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPainter.C;h=6c0b271bfe2d82aaea56d72b67bca0e12ecbab7c;hb=00d24ec87650e4ac7db77ad54cb4aa2f688100f3;hp=d32451ea4c4733013c0fdb1d93f28b43299655f6;hpb=6396f9a204bfa7a154729dfaa17dc7abc619f7d0;p=lyx.git

diff --git a/src/Painter.C b/src/Painter.C
index d32451ea4c..6c0b271bfe 100644
--- a/src/Painter.C
+++ b/src/Painter.C
@@ -332,12 +332,11 @@ PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
 			}
 		}
 	}
-	if (f.underbar() == LyXFont::ON
-#ifndef NO_LATEX
-	    && f.latex() != LyXFont::ON
-#endif
-		)
+
+	if (f.underbar() == LyXFont::ON) {
 		underline(f, x, y, lyxfont::width(s, ls, f));
+	}
+	
 	return *this;
 }
 
@@ -375,12 +374,11 @@ PainterBase & Painter::text(int x, int y, XChar2b const * s, int ls,
 			}
 		}
 	}
-	if (f.underbar() == LyXFont::ON
-#ifndef NO_LATEX
-	    && f.latex() != LyXFont::ON
-#endif
-		)
+	
+	if (f.underbar() == LyXFont::ON) {
 		underline(f, x, y, lyxfont::width(s, ls, f));
+	}
+	
 	return *this;
 }