Merge branch 'spice2x' into spice22x

launcher/shutdown.cpp

@@ -7,6 +7,7 @@
 #include "easrv/easrv.h"
 #include "rawinput/rawinput.h"
 #include "hooks/audio/audio.h"
+#include "util/deferlog.h"
 #include "util/logging.h"
 
 #include "launcher.h"
@@ -23,6 +24,9 @@ namespace launcher {
         // therefore, subsystems need to be guarded against multiple unload attempts
         log_info("launcher", "stopping subsystems");
 
+        // before shutting down logger, dump any deferred log messages
+        deferredlogs::dump_to_logger();
+
         // stop ea server
         easrv_shutdown();