Initialise and shutdown sprite sheet property parser. This fixes a crash when re-initialising RmlUi after it has previously been shut down.

Source/Core/Core.cpp

@@ -42,6 +42,7 @@
 #include "GeometryDatabase.h"
 #include "PluginRegistry.h"
 #include "StyleSheetFactory.h"
+#include "StyleSheetParser.h"
 #include "TemplateCache.h"
 #include "TextureDatabase.h"
 #include "EventSpecification.h"
@@ -116,6 +117,7 @@ bool Initialise()
 	}
 
 	StyleSheetSpecification::Initialise();
+	StyleSheetParser::Initialise();
 	StyleSheetFactory::Initialise();
 
 	TemplateCache::Initialise();
@@ -143,6 +145,7 @@ void Shutdown()
 	Factory::Shutdown();
 	TemplateCache::Shutdown();
 	StyleSheetFactory::Shutdown();
+	StyleSheetParser::Shutdown();
 	StyleSheetSpecification::Shutdown();
 
 	font_interface = nullptr;

Source/Core/StyleSheetParser.cpp

@@ -111,8 +111,7 @@ public:
 
 	bool Parse(const String& name, const String& value) override
 	{
-		static const String str_src = "src";
-		if (name == str_src)
+		if (name == "src")
 		{
 			image_source = value;
 		}
@@ -139,6 +138,8 @@ public:
 };
 
 
+static UniquePtr<SpritesheetPropertyParser> spritesheet_property_parser;
+
 
 StyleSheetParser::StyleSheetParser()
 {
@@ -151,6 +152,16 @@ StyleSheetParser::~StyleSheetParser()
 {
 }
 
+void StyleSheetParser::Initialise()
+{
+	spritesheet_property_parser = MakeUnique<SpritesheetPropertyParser>();
+}
+
+void StyleSheetParser::Shutdown()
+{
+	spritesheet_property_parser.reset();
+}
+
 static bool IsValidIdentifier(const String& str)
 {
 	if (str.empty())
@@ -406,14 +417,11 @@ int StyleSheetParser::Parse(StyleSheetNode* node, Stream* _stream, const StyleSh
 					}
 					else if (at_rule_identifier == "spritesheet")
 					{
-						// This is reasonably heavy to initialize, so we make it static
-						static SpritesheetPropertyParser spritesheet_property_parser;
-						spritesheet_property_parser.Clear();
+						// The spritesheet parser is reasonably heavy to initialize, so we make it a static global.
+						ReadProperties(*spritesheet_property_parser);
 
-						ReadProperties(spritesheet_property_parser);
-
-						const String& image_source = spritesheet_property_parser.GetImageSource();
-						const SpriteDefinitionList& sprite_definitions = spritesheet_property_parser.GetSpriteDefinitions();
+						const String& image_source = spritesheet_property_parser->GetImageSource();
+						const SpriteDefinitionList& sprite_definitions = spritesheet_property_parser->GetSpriteDefinitions();
 						
 						if (at_rule_name.empty())
 						{
@@ -432,7 +440,7 @@ int StyleSheetParser::Parse(StyleSheetNode* node, Stream* _stream, const StyleSh
 							spritesheet_list.AddSpriteSheet(at_rule_name, image_source, stream_file_name, (int)line_number, sprite_definitions);
 						}
 
-						spritesheet_property_parser.Clear();
+						spritesheet_property_parser->Clear();
 						at_rule_name.clear();
 						state = State::Global;
 					}
@@ -527,7 +535,6 @@ StyleSheetNodeListRaw StyleSheetParser::ConstructNodes(StyleSheetNode& root_node
 	return leaf_nodes;
 }
 
-
 bool StyleSheetParser::ReadProperties(AbstractPropertyParser& property_parser)
 {
 	RMLUI_ZoneScoped;

Source/Core/StyleSheetParser.h

@@ -71,6 +71,11 @@ public:
 	// @return The list of leaf nodes in the constructed tree, which are all owned by the root node.
 	static StyleSheetNodeListRaw ConstructNodes(StyleSheetNode& root_node, const String& selectors);
 
+	// Initialises property parsers. Call after initialisation of StylesheetSpecification.
+	static void Initialise();
+	// Reset property parsers.
+	static void Shutdown();
+
 private:
 	// Stream we're parsing from.
 	Stream* stream;