commit 057d83d8ae782c9cae06a108707b82cc77315cde
Author: Juergen Spitzmueller <[email protected]>
Date: Wed Dec 26 14:38:02 2018 +0100
Handle null pointer
---
src/Font.cpp | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/Font.cpp b/src/Font.cpp
index 549f4b8..ea31f40 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -191,9 +191,12 @@ docstring const Font::stateText(BufferParams * params)
const
{
odocstringstream os;
os << lyx::stateText(bits_);
- if (!params || (language() != params->language))
+ if (!params || (language() != params->language)) {
+ // reset_language is a null pointer!
os << bformat(_("Language: %1$s, "),
- _(language()->display()));
+ (language() == reset_language) ? _("Default")
+ :
_(language()->display()));
+ }
if (bits_.number() != FONT_OFF)
os << " " << bformat(_("Number %1$s"),
_(GUIMiscNames[bits_.number()]));