From 3067dac119b57d8a2eee654e01c159f509d62562 Mon Sep 17 00:00:00 2001 From: codeimp Date: Mon, 12 Jan 2009 19:51:51 +0000 Subject: [PATCH] fixed crash on merging sectors together in which case one of the sectors only has lines adjacent to the others --- Source/BuilderModes/ClassicModes/SectorsMode.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/BuilderModes/ClassicModes/SectorsMode.cs b/Source/BuilderModes/ClassicModes/SectorsMode.cs index 21292335..d8f98c72 100644 --- a/Source/BuilderModes/ClassicModes/SectorsMode.cs +++ b/Source/BuilderModes/ClassicModes/SectorsMode.cs @@ -122,9 +122,15 @@ namespace CodeImp.DoomBuilder.BuilderModes } } + // Find the first sector that is not disposed + Sector first = null; + foreach(Sector s in orderedselection) + if(!s.IsDisposed) { first = s; break; } + // Join all selected sectors with the first - for(int i = 1; i < orderedselection.Count; i++) - orderedselection[i].Join(orderedselection[0]); + for(int i = 0; i < orderedselection.Count; i++) + if((orderedselection[i] != first) && !orderedselection[i].IsDisposed) + orderedselection[i].Join(first); } // This highlights a new item