From ff51c735f7346c1c15b6c7d4c862798c25bd3f41 Mon Sep 17 00:00:00 2001
From: codeimp <codeimp@e0d998f2-2e9b-42fe-843d-47128df60a06>
Date: Wed, 1 Apr 2009 08:44:21 +0000
Subject: [PATCH] Fixed crash after merging/joining sectors and selecting the
 result

---
 Source/BuilderModes/ClassicModes/SectorsMode.cs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Source/BuilderModes/ClassicModes/SectorsMode.cs b/Source/BuilderModes/ClassicModes/SectorsMode.cs
index 1706e9d2..2637e7bf 100644
--- a/Source/BuilderModes/ClassicModes/SectorsMode.cs
+++ b/Source/BuilderModes/ClassicModes/SectorsMode.cs
@@ -124,8 +124,8 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			foreach(Sector s in General.Map.Map.Sectors)
 			{
 				// Setup labels
-				TextLabel[] labelarray = new TextLabel[s.Triangles.IslandVertices.Count];
-				for(int i = 0; i < s.Triangles.IslandVertices.Count; i++)
+				TextLabel[] labelarray = new TextLabel[s.Labels.Count];
+				for(int i = 0; i < s.Labels.Count; i++)
 				{
 					Vector2D v = s.Labels[i].position;
 					labelarray[i] = new TextLabel(20);
@@ -207,6 +207,9 @@ namespace CodeImp.DoomBuilder.BuilderModes
 			// Clear selection
 			General.Map.Map.ClearAllSelected();
 			
+			// Update
+			General.Map.Map.Update();
+			
 			// Make text labels for sectors
 			SetupLabels();
 			UpdateSelectedLabels();
@@ -1068,7 +1071,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				General.Map.IsChanged = true;
 
 				// Redraw display
-				General.Map.Map.Update();
 				General.Interface.RedrawDisplay();
 			}
 		}
@@ -1094,7 +1096,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 				General.Map.IsChanged = true;
 
 				// Redraw display
-				General.Map.Map.Update();
 				General.Interface.RedrawDisplay();
 			}
 		}