From 7c7b7477ebd9980aa03e54d7694f6854ba5726bd Mon Sep 17 00:00:00 2001 From: Quentin Ritzler Date: Thu, 9 Apr 2026 14:48:31 +0200 Subject: [PATCH] Move shutdown handler to after LuaEngine initialization --- src/main.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 7fb09e6..1e5c51f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -175,10 +175,6 @@ int BeamMPServerMain(MainArguments Arguments) { Application::SetSubsystemStatus("Main", Application::Status::ShuttingDown); Shutdown = true; }); - Application::RegisterShutdownHandler([] { - auto Futures = LuaAPI::MP::Engine->TriggerEvent("onShutdown", ""); - TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5)); - }); TServer Server(Arguments.List); @@ -195,6 +191,10 @@ int BeamMPServerMain(MainArguments Arguments) { LuaEngine->SetServer(&Server); Application::Console().InitializeLuaConsole(*LuaEngine); LuaEngine->SetNetwork(&Network); + Application::RegisterShutdownHandler([] { + auto Futures = LuaAPI::MP::Engine->TriggerEvent("onShutdown", ""); + TLuaEngine::WaitForAll(Futures, std::chrono::seconds(5)); + }); PPSMonitor.SetNetwork(Network); Application::CheckForUpdates();