From f113736db7339250734e8b9de382565d098b865d Mon Sep 17 00:00:00 2001 From: Lucas Schwiderski Date: Tue, 11 Dec 2018 17:05:09 +0100 Subject: [PATCH] Fix package loading timing --- .../mods/vmf/modules/vmf_package_manager.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/vmf/scripts/mods/vmf/modules/vmf_package_manager.lua b/vmf/scripts/mods/vmf/modules/vmf_package_manager.lua index d8bc7e7..704364c 100644 --- a/vmf/scripts/mods/vmf/modules/vmf_package_manager.lua +++ b/vmf/scripts/mods/vmf/modules/vmf_package_manager.lua @@ -146,17 +146,18 @@ function vmf.update_package_manager() -- return the correct value vmf.safe_call_nr(loading_package.mod, {"'%s' package loaded callback", loading_package.package_name}, loading_package.callback, loading_package.package_name) - else - local queued_package = _queued_packages[1] - if queued_package then - _loading_package = queued_package - table.remove(_queued_packages, 1) + end - _loading_package.resource_package:load() - end + local queued_package = _queued_packages[1] + if queued_package and not _loading_package then + _loading_package = queued_package + table.remove(_queued_packages, 1) + + _loading_package.resource_package:load() end end + -- Forcefully unloads all mods and cleans the queue. function vmf.unload_all_resource_packages() for mod, packages in pairs(_loaded_packages) do