stjr
/
ZoneBuilder
mirror of https://git.do.srb2.org/STJr/ZoneBuilder.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed, Visual mode: fixed a crash, which happened after these steps: delete things in Classic mode -> undo things deletion in Visual mode -> redo things deletion in Visual mode.

This commit is contained in:
MaxED 2016-02-24 14:36:46 +00:00 committed by spherallic
parent b0b57e303b
commit de23006137
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Source/Plugins/BuilderModes/VisualModes/BaseVisualMode.cs
View File

@ -1543,8 +1543,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
// and uses the marks to check what needs to be reloaded.
protected override void ResourcesReloadedPartial()
{
bool sectorsmarked = false;
if(General.Map.UndoRedo.GeometryChanged)
{
// Let the core do this (it will just dispose the sectors that were changed)
@ -1552,6 +1550,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
}
else
{
bool sectorsmarked = false;
// Neighbour sectors must be updated as well
foreach(Sector s in General.Map.Map.Sectors)
{
@ -1608,8 +1608,22 @@ namespace CodeImp.DoomBuilder.BuilderModes
{
// No sectors or geometry changed. So we only have
// to update things when they have changed.
HashSet<Thing> toremove = new HashSet<Thing>(); //mxd
foreach(KeyValuePair<Thing, VisualThing> vt in allthings)
if((vt.Value != null) && vt.Key.Marked) (vt.Value as BaseVisualThing).Rebuild();
{
if((vt.Value != null) && vt.Key.Marked)
{
if(vt.Key.IsDisposed) toremove.Add(vt.Key); //mxd. Disposed things will cause problems
else (vt.Value as BaseVisualThing).Rebuild();
}
}
//mxd. Remove disposed things
foreach(Thing t in toremove)
{
if(allthings[t] != null) allthings[t].Dispose();
allthings.Remove(t);
}
}
else
{