Skip to content

[pull] master from beyond-all-reason:master #58

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
pull merged 2 commits into from
Aug 5, 2026
+6 −2
Merged

[pull] master from beyond-all-reason:master #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10819d8
fix path cleanup when immediate path search fails (#3176)
lostsquirrel1 Aug 4, 2026
9c5dce2
update changelog
lostsquirrel1 Aug 4, 2026
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
1 change: 1 addition & 0 deletions doc/site/content/changelogs/changelog-2026-07.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,3 +115,4 @@ Added a bunch of `debug.emulateFoo` functions that emulate input. Useful for aut
- fix Skirmish AI API compilation issues due to `AIFloat3` having a non-trivial constructor.
- attempt to fix the lack of `wupget:GameProgress` calls when initially catching up.
- fix Lua `VBO::CopyTo` to copy VBO data CPU side in additon to GPU side. Formerly it only copied data GPU side.
- fix QTPFS path cleanup when an immediate path search fails
7 changes: 5 additions & 2 deletions rts/Sim/Path/QTPFS/PathManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,13 +1686,16 @@ unsigned int QTPFS::PathManager::ExecuteImmediateSearch(unsigned int pathId){
registry.remove<PathIsTemp>(pathEntity);
registry.remove<PathIsDirty>(pathEntity);
} else {
DeletePathEntity(pathEntity);
pathId = 0;
}
}
}

RemovePathSearch(pathEntity);
// If successful, just remove the path search, otherwise delete the path entity and its search.
if (pathId > 0)
RemovePathSearch(pathEntity);
else
DeletePathEntity(pathEntity);

return pathId;
}
Expand Down