From a86327245eea5638b933aec795026699201c19e1 Mon Sep 17 00:00:00 2001
From: Benoit Germain <benoit.germain@ubisoft.com>
Date: Mon, 28 Apr 2025 11:17:48 +0200
Subject: Minor internal tweaks in shutdown code

---
 src/keeper.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/keeper.cpp')

diff --git a/src/keeper.cpp b/src/keeper.cpp
index c8c470f..ca2a80d 100644
--- a/src/keeper.cpp
+++ b/src/keeper.cpp
@@ -952,15 +952,15 @@ void Keepers::collectGarbage()
 // #################################################################################################
 
 
-void Keepers::close()
+bool Keepers::close()
 {
     if (isClosing.test_and_set(std::memory_order_release)) {
-        assert(false); // should never close more than once in practice
-        return;
+        return false; // should never close more than once in practice
     }
 
+    // We may have not initialized the keepers if an error was raised in Universe::Create because of bad settings
     if (std::holds_alternative<std::monostate>(keeper_array)) {
-        return;
+        return true;
     }
 
     auto _closeOneKeeper = [](Keeper& keeper_) {
@@ -989,6 +989,7 @@ void Keepers::close()
     }
 
     keeper_array.emplace<std::monostate>();
+    return true;
 }
 
 // #################################################################################################
-- 
cgit v1.2.3-55-g6feb