リリースブランチをマージ。

dromozoa · Jan 23, 2019 · 228575f · 228575f
2 parents 7fe960b + e3a7a5f
commit 228575f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/dromozoa-multi-1.3-1.rockspec → dromozoa-multi-1.4-1.rockspec b/dromozoa-multi-1.3-1.rockspec → dromozoa-multi-1.4-1.rockspec
@@ -1,8 +1,8 @@
 rockspec_format = "3.0"
 package = "dromozoa-multi"
-version = "1.3-1"
+version = "1.4-1"
 source = {
-  url = "https://github.com/dromozoa/dromozoa-multi/releases/download/v1.3/dromozoa-multi-1.3.tar.gz";
+  url = "https://github.com/dromozoa/dromozoa-multi/releases/download/v1.4/dromozoa-multi-1.4.tar.gz";
 }
 description = {
   summary = "Multiple Lua states and native threads";

diff --git a/thread.cpp b/thread.cpp
@@ -67,10 +67,12 @@ namespace dromozoa {
             break;
           case LUA_TLIGHTUSERDATA:
             lua_pushlightuserdata(that->get(), lua_touserdata(L, i));
+            ++n;
             break;
           default:
             lua_pop(that->get(), n);
             luaL_argerror(L, i, "nil/number/boolean/string expected");
+            return;
         }
       }
       luaX_push(that->get(), n);

diff --git a/version.m4 b/version.m4
@@ -1 +1 @@
-m4_define(DROMOZOA_MULTI_VERSION,1.3)
+m4_define(DROMOZOA_MULTI_VERSION,1.4)