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.

1 files changed, 5 insertions, 4 deletions

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;