From 313ca53b368abf376d3207b32fb9c8fd4291965f Mon Sep 17 00:00:00 2001
From: Muhammad Rifqi Priyo Susanto <muhammadrifqipriyosusanto@gmail.com>
Date: Sat, 3 Jun 2017 09:51:48 +0700
Subject: Fix issue Minetest crash when custom font path is not exist

We try to use default fallback for both mono and main font when custom font path is not exist. This way, if Minetest is not corrupted, we could avoid crash.
---
 src/settings.cpp | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

(limited to 'src/settings.cpp')

diff --git a/src/settings.cpp b/src/settings.cpp
index b4083264e..61f35e911 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -362,6 +362,18 @@ const SettingsEntry &Settings::getEntry(const std::string &name) const
 }
 
 
+const SettingsEntry &Settings::getEntryDefault(const std::string &name) const
+{
+	MutexAutoLock lock(m_mutex);
+
+	SettingEntries::const_iterator n;
+	if ((n = m_defaults.find(name)) == m_defaults.end()) {
+		throw SettingNotFoundException("Setting [" + name + "] not found.");
+	}
+	return n->second;
+}
+
+
 Settings *Settings::getGroup(const std::string &name) const
 {
 	const SettingsEntry &entry = getEntry(name);
@@ -380,6 +392,15 @@ const std::string &Settings::get(const std::string &name) const
 }
 
 
+const std::string &Settings::getDefault(const std::string &name) const
+{
+	const SettingsEntry &entry = getEntryDefault(name);
+	if (entry.is_group)
+		throw SettingNotFoundException("Setting [" + name + "] is a group.");
+	return entry.value;
+}
+
+
 bool Settings::getBool(const std::string &name) const
 {
 	return is_yes(get(name));
@@ -568,6 +589,17 @@ bool Settings::getEntryNoEx(const std::string &name, SettingsEntry &val) const
 }
 
 
+bool Settings::getEntryDefaultNoEx(const std::string &name, SettingsEntry &val) const
+{
+	try {
+		val = getEntryDefault(name);
+		return true;
+	} catch (SettingNotFoundException &e) {
+		return false;
+	}
+}
+
+
 bool Settings::getGroupNoEx(const std::string &name, Settings *&val) const
 {
 	try {
@@ -590,6 +622,17 @@ bool Settings::getNoEx(const std::string &name, std::string &val) const
 }
 
 
+bool Settings::getDefaultNoEx(const std::string &name, std::string &val) const
+{
+	try {
+		val = getDefault(name);
+		return true;
+	} catch (SettingNotFoundException &e) {
+		return false;
+	}
+}
+
+
 bool Settings::getFlag(const std::string &name) const
 {
 	try {
-- 
cgit v1.2.3