diff options
author | 2016-01-31 00:59:23 +0100 | |
---|---|---|
committer | 2016-01-31 00:59:23 +0100 | |
commit | 0f4b6b0e46f1634ba6d4845be9ad2195cad5abec (patch) | |
tree | 025150ac03b89f7dfe7f85b1d65a5687e6a27fd7 /src/emu/luaengine.cpp | |
parent | 16d9f27d0636246493ee95869d93c6a18763c7a2 (diff) | |
parent | 1a76d2d5a56b596d9cbea170174825e81c43d700 (diff) |
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'src/emu/luaengine.cpp')
-rw-r--r-- | src/emu/luaengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emu/luaengine.cpp b/src/emu/luaengine.cpp index f487c02bed6..c4136cd744a 100644 --- a/src/emu/luaengine.cpp +++ b/src/emu/luaengine.cpp @@ -848,7 +848,7 @@ void lua_engine::serve_lua() // Do action on client side { - osd_sleep(osd_ticks_per_second() / 1000); + std::lock_guard<std::mutex> lock(g_mutex); if (msg.status == -1) { b = LUA_PROMPT2; |