aboutsummaryrefslogtreecommitdiff
path: root/src/ResourceLoader.cpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2022-11-04 11:02:04 +0100
committerdec05eba <dec05eba@protonmail.com>2022-11-04 11:02:04 +0100
commitf89117b5cf36797b04291942b2f2494895fc58dd (patch)
treef04f11b6c6a0bebea7e628a8426ab2c7fd3b922a /src/ResourceLoader.cpp
parent6e0948afb1bf1504b00601ff195c9fb05e9f2c1c (diff)
Matrix: fix nullptr crash when room avatar is changed
Diffstat (limited to 'src/ResourceLoader.cpp')
-rw-r--r--src/ResourceLoader.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/ResourceLoader.cpp b/src/ResourceLoader.cpp
index 401ca38..e5d16dd 100644
--- a/src/ResourceLoader.cpp
+++ b/src/ResourceLoader.cpp
@@ -43,12 +43,10 @@ namespace QuickMedia {
std::string output;
const char *args[] = { "fc-match", font_name.c_str(), "file", nullptr };
- if(exec_program(args, accumulate_string, &output) == 0 && output.size() > 6 && output.size() >= font_name.size()) {
+ if(exec_program(args, accumulate_string, &output) == 0 && output.size() > 6) {
output = strip(output);
- if(string_ends_with(output, "/" + font_name)) {
- font_filepath_result = output.substr(6);
- return true;
- }
+ font_filepath_result = output.substr(6);
+ return true;
}
fprintf(stderr, "Warning: failed to find font: %s\n", font_name.c_str());