mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

fix SubtitleProvider initialization order

Browse source 
Originally committed to SVN as r368.
This commit is contained in:
David Lamparter 2006-05-06 02:41:50 +00:00
parent 24f889af56
commit 77545ee654
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/subtitle_provider.cpp
View file

@ -39,15 +39,17 @@
#include "subtitle_provider.h" #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) 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) SubtitleProvider *SubtitleProvider::Class::GetProvider(wxString provider_name, AssFile *subs)
{ {
return classes[provider_name]->Get(subs); return (*classes)[provider_name]->Get(subs);
} }

2
core/subtitle_provider.h
View file

@ -71,7 +71,7 @@ public:
// }; // };
class Class { class Class {
private: private:
static std::map<wxString, SubtitleProvider::Class *> classes; static std::map<wxString, SubtitleProvider::Class *> *classes;
public: public:
Class(wxString name); Class(wxString name);