summaryrefslogtreecommitdiffhomepage
path: root/StarsEx
diff options
context:
space:
mode:
Diffstat (limited to 'StarsEx')
-rw-r--r--StarsEx/DataLoader.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/StarsEx/DataLoader.cpp b/StarsEx/DataLoader.cpp
index 22ac803..4e35cab 100644
--- a/StarsEx/DataLoader.cpp
+++ b/StarsEx/DataLoader.cpp
@@ -20,7 +20,6 @@
// +------------------------------------------------------------------+
-static DataLoader* def_loader = 0;
DataLoader* DataLoader::loader = 0;
static List<DataArchive> archives;
@@ -44,10 +43,10 @@ DataLoader::UseVideo(Video* v)
void
DataLoader::Initialize()
{
- def_loader = new DataLoader;
- loader = def_loader;
-
- archives.destroy();
+ if (!loader) {
+ loader = new DataLoader;
+ archives.destroy();
+ }
}
void
@@ -55,10 +54,8 @@ DataLoader::Close()
{
archives.destroy();
Bitmap::ClearCache();
-
- delete def_loader;
- def_loader = 0;
- loader = 0;
+ delete loader;
+ loader = nullptr;
}
void