From 514d417626ca60e6d7a370cc44262ed3ee2c9566 Mon Sep 17 00:00:00 2001
From: Azumgi <4zumgi@gmail.com>
Date: Fri, 4 Jan 2019 09:38:53 +0300
Subject: [PATCH] [VMF Package Manager] Better queue handling

---
 .../mods/vmf/modules/vmf_package_manager.lua  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/vmf/scripts/mods/vmf/modules/vmf_package_manager.lua b/vmf/scripts/mods/vmf/modules/vmf_package_manager.lua
index b98faa3..35c1a40 100644
--- a/vmf/scripts/mods/vmf/modules/vmf_package_manager.lua
+++ b/vmf/scripts/mods/vmf/modules/vmf_package_manager.lua
@@ -54,6 +54,16 @@ local function flush_package(package_name)
   end
 end
 
+
+local function remove_package_from_queue(package_name)
+  for i, queued_package_name in ipairs(_queued_packages) do
+    if package_name == queued_package_name then
+      table.remove(_queued_packages, i)
+      return
+    end
+  end
+end
+
 -- #####################################################################################################################
 -- ##### VMFMod ########################################################################################################
 -- #####################################################################################################################
@@ -101,6 +111,9 @@ function VMFMod:load_package(package_name, callback, sync)
     if _packages[package_name].status == "queued" then
       resource_package:load()
     end
+    if is_already_queued then
+      remove_package_from_queue(package_name)
+    end
     flush_package(package_name)
   else
     if is_already_queued then
@@ -130,12 +143,7 @@ function VMFMod:unload_package(package_name)
   end
 
   if package_status == "queued" then
-    for i, queued_package_name in ipairs(_queued_packages) do
-      if package_name == queued_package_name then
-        table.remove(_queued_packages, i)
-        break
-      end
-    end
+    remove_package_from_queue(package_name)
   elseif package_status == "loading" then
     self:error(ERRORS.REGULAR.cant_unload_loading_package, package_name)
     return