Fixed resources delete errors

Author: xam4lor

src/WaterDropEngine/WdeResourceManager/WdeResourceManager.cpp

@@ -9,24 +9,32 @@ namespace wde::resource {
 		WDE_PROFILE_FUNCTION();
 		logger::log(LogLevel::DEBUG, LogChannel::RES) << "Ticking for resource manager." << logger::endl;
 
-		// Delete resources that need to be deleted
-		for (auto& res : _resourcesToDelete) {
+		// Select resources that need to be deleted
+		std::vector<decltype(_resourcesToDelete)::key_type> vecToDelete;
+		for (auto&& el : _resourcesToDelete) {
 			// Decrease ticks
-			res.second.first--;
+			el.second--;
 
 			// If no ticks remaining, delete
-			if (res.second.first <= 0) {
-				if (res.second.second->getReferenceCount() > 0) {
-					_resourcesToDelete.erase(res.first);
+			if (el.second <= 0) {
+				// Resource not loaded or reloaded since last time
+				if (!_resources.contains(el.first) || _resources.at(el.first)->getReferenceCount() > 0) {
+					vecToDelete.emplace_back(el.first);
 					continue;
 				}
 
-				logger::log(LogLevel::DEBUG, LogChannel::RES) << "Releasing resource \"" << res.first << "\"." << logger::endl;
-				_resourcesByType[res.second.second->getType()].erase(res.first);
-				_resources.erase(res.first);
-				_resourcesToDelete.erase(res.first);
+				// Release resource
+				_resourcesByType[_resources.at(el.first)->getType()].erase(el.first);
+				_resources.erase(el.first);
+				vecToDelete.emplace_back(el.first);
 			}
 		}
+
+		// Erase resources that need to be deleted
+		for (auto&& key : vecToDelete) {
+			logger::log(LogLevel::DEBUG, LogChannel::RES) << "Releasing resource \"" << key << "\"." << logger::endl;
+			_resourcesToDelete.erase(key);
+		}
 	}
 
 	void WdeResourceManager::cleanUp() {

src/WaterDropEngine/WdeResourceManager/WdeResourceManager.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <utility>
+#include <queue>
 
 #include "../../wde.hpp"
 #include "../WdeCore/Core/Module.hpp"
@@ -50,6 +51,7 @@ namespace wde::resource {
 			 * @param resource The path to the resource
 			 */
 			void release(const std::string& resource) {
+				// Not loaded in memory
 				if (!_resources.contains(resource))
 					return;
 
@@ -60,8 +62,8 @@ namespace wde::resource {
 				res->decreaseReferenceCount();
 
 				// Release resource if it can (3 ticks remaining)
-				if (res->getReferenceCount() <= 0)
-					_resourcesToDelete.emplace(res->getPath(), std::pair(3, res.get()));
+				if (res->getReferenceCount() <= 0 && !_resourcesToDelete.contains(res->getPath()))
+					_resourcesToDelete.emplace(res->getPath(), 3);
 			}
 
 
@@ -77,7 +79,7 @@ namespace wde::resource {
 			std::unordered_map<std::string, std::shared_ptr<Resource>> _resources {};
 			/** Resources list by type */
 			std::unordered_map<Resource::ResourceType, std::unordered_map<std::string, std::shared_ptr<Resource>>> _resourcesByType {};
-			/** Resources list that needs to be deleted by path (name - (tickRemainingBeforeDeleting, Resource*)) */
-			std::unordered_map<std::string, std::pair<int, Resource*>> _resourcesToDelete {};
+			/** Resources list that needs to be deleted by path (name - tickRemainingBeforeDeleting) */
+			std::unordered_map<std::string, int> _resourcesToDelete {};
 	};
 }