Fixed crash when undo was used after Linedef drag (which involves a merge)

This commit is contained in:
codeimp 2009-04-09 05:57:24 +00:00
parent 7a31c07eec
commit d46b5cb4e3
3 changed files with 4 additions and 4 deletions

View file

@ -705,7 +705,7 @@ namespace CodeImp.DoomBuilder.Map
nl = map.CreateLinedef(v, end); nl = map.CreateLinedef(v, end);
CopyPropertiesTo(nl); CopyPropertiesTo(nl);
SetEndVertex(v); SetEndVertex(v);
nl.selected = this.selected; nl.Selected = this.Selected;
nl.marked = this.marked; nl.marked = this.marked;
// Copy front sidedef if exists // Copy front sidedef if exists
@ -902,7 +902,7 @@ namespace CodeImp.DoomBuilder.Map
} }
// If either of the two lines was selected, keep the other selected // If either of the two lines was selected, keep the other selected
if(this.selected) other.selected = true; if(this.Selected) other.Selected = true;
if(this.marked) other.marked = true; if(this.marked) other.marked = true;
// I got killed by the other. // I got killed by the other.

View file

@ -39,7 +39,7 @@ namespace CodeImp.DoomBuilder.Map
#region ================== Variables #region ================== Variables
// Selected or not? // Selected or not?
protected bool selected; private bool selected;
// Group bitmask // Group bitmask
private int groups; private int groups;

View file

@ -253,7 +253,7 @@ namespace CodeImp.DoomBuilder.Map
public void Join(Vertex other) public void Join(Vertex other)
{ {
// If either of the two vertices was selected, keep the other selected // If either of the two vertices was selected, keep the other selected
if(this.selected) other.selected = true; if(this.Selected) other.Selected = true;
if(this.marked) other.marked = true; if(this.marked) other.marked = true;
// Any linedefs to move? // Any linedefs to move?