diff options
| author | Muhammad Rifqi Priyo Susanto <muhammadrifqipriyosusanto@gmail.com> | 2017-06-03 09:51:48 +0700 |
|---|---|---|
| committer | SmallJoker <mk939@ymail.com> | 2018-06-03 17:32:00 +0200 |
| commit | 313ca53b368abf376d3207b32fb9c8fd4291965f (patch) | |
| tree | 1243fdc37f2804233f75a1e87d04375d533b8638 /src/settings.h | |
| parent | a65a46b8891255011e0f0b19490fcb7cf306f076 (diff) | |
| download | minetest-313ca53b368abf376d3207b32fb9c8fd4291965f.tar.gz minetest-313ca53b368abf376d3207b32fb9c8fd4291965f.tar.bz2 minetest-313ca53b368abf376d3207b32fb9c8fd4291965f.zip | |
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.
Diffstat (limited to 'src/settings.h')
| -rw-r--r-- | src/settings.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/settings.h b/src/settings.h index 8c4f6e559..a19c15a76 100644 --- a/src/settings.h +++ b/src/settings.h @@ -135,8 +135,10 @@ public: ***********/ const SettingsEntry &getEntry(const std::string &name) const; + const SettingsEntry &getEntryDefault(const std::string &name) const; Settings *getGroup(const std::string &name) const; const std::string &get(const std::string &name) const; + const std::string &getDefault(const std::string &name) const; bool getBool(const std::string &name) const; u16 getU16(const std::string &name) const; s16 getS16(const std::string &name) const; @@ -165,8 +167,10 @@ public: ***************************************/ bool getEntryNoEx(const std::string &name, SettingsEntry &val) const; + bool getEntryDefaultNoEx(const std::string &name, SettingsEntry &val) const; bool getGroupNoEx(const std::string &name, Settings *&val) const; bool getNoEx(const std::string &name, std::string &val) const; + bool getDefaultNoEx(const std::string &name, std::string &val) const; bool getFlag(const std::string &name) const; bool getU16NoEx(const std::string &name, u16 &val) const; bool getS16NoEx(const std::string &name, s16 &val) const; |