From de402edc09afa7d90359bbf35e2c56e2b47bae75 Mon Sep 17 00:00:00 2001 From: Paul Cornett Date: Sun, 6 Sep 2015 20:56:59 -0700 Subject: [PATCH] Fix null pointer check from 198d7c6c (r40919) operator '?:' has lower precedence than '+' (cherry picked from commit 845444f35febb292103fa3bf6ec2a2f7ace65d8d) --- src/html/m_layout.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp index 0bc769bf52..441ed3c6ba 100644 --- a/src/html/m_layout.cpp +++ b/src/html/m_layout.cpp @@ -406,7 +406,7 @@ TAG_HANDLER_BEGIN(SUBSUP, "SUB,SUP") m_WParser->SetScriptMode(issub ? wxHTML_SCRIPT_SUB : wxHTML_SCRIPT_SUP); m_WParser->SetScriptBaseline( - oldbase + c ? c->GetScriptBaseline() : 0); + oldbase + (c ? c->GetScriptBaseline() : 0)); // select smaller font m_WParser->SetFontSize(m_WParser->GetFontSize()-2);