Skip to content

Fix #798: Pin down startResource and stopResource behaviour #957

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 26, 2019
Merged

Fix #798: Pin down startResource and stopResource behaviour #957

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ int CLuaResourceDefs::startResource(lua_State* luaVM)
// In the event 'onResourcePreStart' the resource will be in the 'starting' state
// and in the event 'onResourceStart' the resource is already in the 'running' state
// and you can't force-start resources in the 'stopping' state
lua_pushboolean(luaVM, true);
lua_pushboolean(luaVM, false);
}
else if (pResource->IsLoaded())
{
Expand Down Expand Up @@ -577,9 +577,11 @@ int CLuaResourceDefs::stopResource(lua_State* luaVM)

// Schedule it for a stop
m_pResourceManager->QueueResource(pResource, CResourceManager::QUEUE_STOP, nullptr);
lua_pushboolean(luaVM, true);
return 1;
}

lua_pushboolean(luaVM, true);
lua_pushboolean(luaVM, false);
return 1;
}

Expand Down