The filesystem module can shut itself down

codereader · Jan 3, 2017 · eaf2f21 · eaf2f21
1 parent e8e830c
commit eaf2f21
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/plugins/vfspk3/Doom3FileSystem.cpp b/plugins/vfspk3/Doom3FileSystem.cpp
@@ -358,3 +358,8 @@ void Doom3FileSystem::initialiseModule(const ApplicationContext& ctx)
 
     initialise();
 }
+
+void Doom3FileSystem::shutdownModule()
+{
+	shutdown();
+}
diff --git a/plugins/vfspk3/Doom3FileSystem.h b/plugins/vfspk3/Doom3FileSystem.h
@@ -61,9 +61,10 @@ class Doom3FileSystem :
 	virtual void removeObserver(Observer& observer);
 
 	// RegisterableModule implementation
-	virtual const std::string& getName() const;
-	virtual const StringSet& getDependencies() const;
-	virtual void initialiseModule(const ApplicationContext& ctx);
+	const std::string& getName() const override;
+	const StringSet& getDependencies() const override;
+	void initialiseModule(const ApplicationContext& ctx) override;
+	void shutdownModule() override;
 
 private:
 	void initPakFile(ArchiveLoader& archiveModule, const std::string& filename);

diff --git a/radiant/RadiantModule.cpp b/radiant/RadiantModule.cpp
@@ -8,7 +8,6 @@
 #include "iregistry.h"
 #include "icommandsystem.h"
 #include "itextstream.h"
-#include "ifilesystem.h"
 #include "iuimanager.h"
 #include "ieclass.h"
 #include "ipreferencesystem.h"
@@ -218,8 +217,6 @@ void RadiantModule::shutdownModule()
 {
 	rMessage() << "RadiantModule::shutdownModule called." << std::endl;
 
-	GlobalFileSystem().shutdown();
-
     _radiantShutdown.clear();
 }