Improve shutdown process

1 files changed, 2 insertions, 0 deletions

diff --git a/src/httpserver.cpp b/src/httpserver.cpp
index ba01255400..adb64a65d7 100644
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -481,6 +481,8 @@ void StopHTTPServer()
     }
     if (eventBase) {
         LogPrint(BCLog::HTTP, "Waiting for HTTP event thread to exit\n");
+        // Exit the event loop as soon as there are no active events.
+        event_base_loopexit(eventBase, nullptr);
         // Give event loop a few seconds to exit (to send back last RPC responses), then break it
         // Before this was solved with event_base_loopexit, but that didn't work as expected in
         // at least libevent 2.0.21 and always introduced a delay. In libevent