Merge branch 'develop' into sol3

# Conflicts:
#	include/single/sol/sol.hpp
#	include/single/sol/sol_forward.hpp
This commit is contained in:
ThePhD 2018-11-27 22:20:59 -05:00
commit 1e514f145f
No known key found for this signature in database
GPG Key ID: 1509DB1C0F702BFA

View File

@ -109,7 +109,7 @@ namespace sol {
if (keyidx != -1) {
stack::remove(ref.lua_state(), keyidx, 1);
}
if (ref.valid()) {
if (ref.lua_state() != nullptr && ref.valid()) {
stack::remove(ref.lua_state(), tableidx, 1);
}
}