Merge branch 'master' into jgrpp
# Conflicts: # src/core/bitmath_func.cpp # src/core/bitmath_func.hpp # src/core/geometry_type.hpp # src/game/game_text.hpp # src/graph_gui.cpp # src/pathfinder/npf/npf.cpp # src/script/api/script_text.cpp # src/spritecache.cpp # src/track_func.h
This commit is contained in:
@@ -34,6 +34,8 @@ static std::tuple<std::string, std::string> SplitFontFamilyAndStyle(std::string_
|
||||
if (separator == std::string_view::npos) return { std::string(font_name), std::string() };
|
||||
|
||||
auto begin = font_name.find_first_not_of("\t ", separator + 1);
|
||||
if (begin == std::string_view::npos) return { std::string(font_name.substr(0, separator)), std::string() };
|
||||
|
||||
return { std::string(font_name.substr(0, separator)), std::string(font_name.substr(begin)) };
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user