more workaround (nw)

This commit is contained in:
Vas Crabb 2017-02-27 23:21:30 +11:00
parent 5d48b92701
commit 93a1a444d2
2 changed files with 4 additions and 3 deletions

View File

@ -121,8 +121,8 @@ machine_manager::~machine_manager()
{ {
if (options().http()) if (options().http())
m_server->stop(); m_server->stop();
if (m_server_thread.joinable()) if (m_server_thread.joinable())
m_server_thread.join(); m_server_thread.join();
} }
void machine_manager::start_http_server() void machine_manager::start_http_server()

View File

@ -44,7 +44,8 @@ protected:
private: private:
// device iterator // device iterator
typedef device_type_iterator<device_creator<DeviceType>, DeviceType> iterator; static constexpr device_type TYPE = device_creator<DeviceType>;
typedef device_type_iterator<TYPE, DeviceType> iterator;
DeviceType * m_device; DeviceType * m_device;
int m_count; int m_count;