summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-02-24 10:07:32 +1100
committer Vas Crabb <vas@vastheman.com>2017-02-24 10:07:32 +1100
commit55e5e6992b2a26ab26b3a9b9343a0f954e316f26 (patch)
treefb71ea0d5fb3e9c9297ef0b24a3c6a5bee196de1 /src
parent759933ded7422e58b69e0f50841311067a156557 (diff)
don't assume thread is always started (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/main.cpp5
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()