Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-06 09:00:04 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

more workaround (nw)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/main.cpp
View File

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

3
src/frontend/mame/ui/devctrl.h
View File

@ -44,7 +44,8 @@ protected:
private:
// 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;
int m_count;