From 531fa2ce849c961fe96de10eb292937dcf9d6184 Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 21 Apr 2014 10:42:20 +0200 Subject: [PATCH] Fixed PluginManager initialization Former-commit-id: 5125e58bc5c73ed36088f52356728687db23e494 --- src/Nazara/Core/PluginManager.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Nazara/Core/PluginManager.cpp b/src/Nazara/Core/PluginManager.cpp index ffaf12780..5ee08fe91 100644 --- a/src/Nazara/Core/PluginManager.cpp +++ b/src/Nazara/Core/PluginManager.cpp @@ -38,10 +38,11 @@ bool NzPluginManager::Initialize() if (s_initialized) return true; + s_initialized = true; + AddDirectory("."); AddDirectory("plugins"); - s_initialized = true; return true; } @@ -162,6 +163,8 @@ void NzPluginManager::Uninitialize() if (!s_initialized) return; + s_initialized = false; + s_directories.clear(); for (auto& pair : s_plugins) @@ -175,8 +178,6 @@ void NzPluginManager::Uninitialize() } s_plugins.clear(); - - s_initialized = false; } std::set NzPluginManager::s_directories;