Skip to content

Lua Crash Fixes #33

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
Causeless merged 3 commits into from
Jan 22, 2024
Merged

Lua Crash Fixes #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8a104a
Fix crash from Lua GC during ConsoleMan script update
Causeless Jan 22, 2024
9c12bc1
More accurate update order in case scripts are reloaded via UInputMan
Causeless Jan 22, 2024
7ee1d59
Fixed segfault on reloading objects without a preset
Causeless Jan 22, 2024
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
2 changes: 1 addition & 1 deletion Source/Entities/MovableObject.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ int MovableObject::ReloadScripts() {

// TODO consider getting rid of this const_cast. It would require either code duplication or creating some non-const methods (specifically of PresetMan::GetEntityPreset, which may be unsafe. Could be this gross exceptional handling is the best way to go.
MovableObject* movableObjectPreset = const_cast<MovableObject*>(dynamic_cast<const MovableObject*>(g_PresetMan.GetEntityPreset(GetClassName(), GetPresetName(), GetModuleID())));
if (this != movableObjectPreset) {
if (movableObjectPreset && this != movableObjectPreset) {
movableObjectPreset->ReloadScripts();
}

Expand Down
6 changes: 4 additions & 2 deletions Source/Main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,10 @@ void RunGameLoop() {

g_PerformanceMan.StartPerformanceMeasurement(PerformanceMan::SimTotal);

g_LuaMan.Update();

g_UInputMan.Update();
g_ConsoleMan.Update();

// It is vital that server is updated after input manager but before activity because input manager will clear received pressed and released events on next update.
if (g_NetworkServer.IsServerModeEnabled()) {
Expand All @@ -328,7 +331,7 @@ void RunGameLoop() {
}

g_FrameMan.Update();
g_LuaMan.Update();

g_ActivityMan.Update();

if (g_SceneMan.GetScene()) {
Expand All @@ -347,7 +350,6 @@ void RunGameLoop() {
// It's in this spot to allow it to be set by UInputMan update and ConsoleMan update, and read from ActivityMan update.
g_PresetMan.ClearReloadEntityPresetCalledThisUpdate();

g_ConsoleMan.Update();
g_PerformanceMan.StopPerformanceMeasurement(PerformanceMan::SimTotal);

if (!g_ActivityMan.IsInActivity()) {
Expand Down