Closes #20 avoiding null reference when no LocatedWindows in arrangement

bright-tools · Sep 17, 2016 · 4355be0 · 4355be0
1 parent 6383489
commit 4355be0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/DeRange/Forms/ArrangementEdit.cs b/DeRange/Forms/ArrangementEdit.cs
@@ -126,8 +126,8 @@ private void SetArrangementEditEnabled()
         private void SetLocatedWindowButtons()
         {
             bool enabled = (m_config.Arrangements.Count > 0) && (SelectedArrangement!= null) && (SelectedLocatedWindow != null);
-            upButton.Enabled = enabled && (SelectedLocatedWindow != SelectedArrangement.WindowPositions.First());
-            downButton.Enabled = enabled && (SelectedLocatedWindow != SelectedArrangement.WindowPositions.Last());
+            upButton.Enabled = enabled && (SelectedLocatedWindow != SelectedArrangement.WindowPositions.FirstOrDefault());
+            downButton.Enabled = enabled && (SelectedLocatedWindow != SelectedArrangement.WindowPositions.LastOrDefault());
         }
 
         void windowConfigurationListChanged(object sender, ListChangedEventArgs e)