diff options
Diffstat (limited to 'src/emu/main.cpp')
-rw-r--r-- | src/emu/main.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/emu/main.cpp b/src/emu/main.cpp index 54890c5dff0..ba3283e5a7d 100644 --- a/src/emu/main.cpp +++ b/src/emu/main.cpp @@ -120,10 +120,9 @@ machine_manager::machine_manager(emu_options& options, osd_interface& osd) machine_manager::~machine_manager() { if (options().http()) - { m_server->stop(); - } - m_server_thread.join(); + if (m_server_thread.joinable()) + m_server_thread.join(); } void machine_manager::start_http_server() |