From 034aa81895b201164004d79aa090e882e3e66945 Mon Sep 17 00:00:00 2001
From: Aki <please@ignore.pl>
Date: Sun, 10 Apr 2022 15:24:32 +0200
Subject: Moved archives list from static part of impl to loader member

Including Archive.h in DataLoader.h created name conflicts and created
an error due to missing types from Types.h in the Archive.h itself.
---
 StarsEx/DataLoader.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'StarsEx/DataLoader.cpp')

diff --git a/StarsEx/DataLoader.cpp b/StarsEx/DataLoader.cpp
index 4e35cab..72eaf4b 100644
--- a/StarsEx/DataLoader.cpp
+++ b/StarsEx/DataLoader.cpp
@@ -22,14 +22,17 @@
 
 DataLoader*   DataLoader::loader = 0;
 
-static List<DataArchive>   archives;
-
 // +--------------------------------------------------------------------+
 
 DataLoader::DataLoader()
     : datapath(""), video(0), use_file_system(true), enable_media(true)
 { }
 
+DataLoader::~DataLoader()
+{
+    archives.destroy();
+}
+
 // +--------------------------------------------------------------------+
 
 void
@@ -45,14 +48,12 @@ DataLoader::Initialize()
 {
     if (!loader) {
         loader = new DataLoader;
-        archives.destroy();
     }
 }
 
 void
 DataLoader::Close()
 {
-    archives.destroy();
     Bitmap::ClearCache();
     delete loader;
     loader = nullptr;
-- 
cgit v1.1