From 77545ee6547a239464b7118d7eaf81f36b924db3 Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@diac24.net>
Date: Sat, 6 May 2006 02:41:50 +0000
Subject: [PATCH] fix SubtitleProvider initialization order

Originally committed to SVN as r368.
---
 core/subtitle_provider.cpp | 8 +++++---
 core/subtitle_provider.h   | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/subtitle_provider.cpp b/core/subtitle_provider.cpp
index fdcedd466..7deebdb9e 100644
--- a/core/subtitle_provider.cpp
+++ b/core/subtitle_provider.cpp
@@ -39,15 +39,17 @@
 #include "subtitle_provider.h"
 
 
-std::map<wxString, SubtitleProvider::Class *> SubtitleProvider::Class::classes;
+std::map<wxString, SubtitleProvider::Class *> *SubtitleProvider::Class::classes = NULL;
 
 SubtitleProvider::Class::Class(wxString name)
 {
-	classes.insert(std::make_pair(name, this));
+	if (!classes)
+		classes = new std::map<wxString, SubtitleProvider::Class *>();
+	(*classes)[name] = this;
 }
 
 SubtitleProvider *SubtitleProvider::Class::GetProvider(wxString provider_name, AssFile *subs)
 {
-	return classes[provider_name]->Get(subs);
+	return (*classes)[provider_name]->Get(subs);
 }
 
diff --git a/core/subtitle_provider.h b/core/subtitle_provider.h
index 51c71604c..26b89b763 100644
--- a/core/subtitle_provider.h
+++ b/core/subtitle_provider.h
@@ -71,7 +71,7 @@ public:
 	//	};
 	class Class {
 	private:
-		static std::map<wxString, SubtitleProvider::Class *> classes;
+		static std::map<wxString, SubtitleProvider::Class *> *classes;
 
 	public:
 		Class(wxString name);