From 656e9b5159fe766ebc8943c2a5ae22127d84f15b Mon Sep 17 00:00:00 2001
From: tznind <t.z.nind@dundee.ac.uk>
Date: Wed, 27 Jan 2021 14:40:57 +0000
Subject: [PATCH] Fixed Scenario for deleting last column in table

---
 UICatalog/Scenarios/CsvEditor.cs | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/UICatalog/Scenarios/CsvEditor.cs b/UICatalog/Scenarios/CsvEditor.cs
index 6972c759f..e595265e2 100644
--- a/UICatalog/Scenarios/CsvEditor.cs
+++ b/UICatalog/Scenarios/CsvEditor.cs
@@ -93,7 +93,7 @@ namespace UICatalog.Scenarios {
 		{
 			selectedCellLabel.Text = $"{tableView.SelectedRow},{tableView.SelectedColumn}";
 			
-			if(tableView.Table == null)
+			if(tableView.Table == null || tableView.SelectedColumn == -1)
 				return;
 
 			var col = tableView.Table.Columns[tableView.SelectedColumn];
@@ -125,8 +125,20 @@ namespace UICatalog.Scenarios {
 				return;
 			}
 
-			tableView.Table.Columns.RemoveAt(tableView.SelectedColumn);
-			tableView.Update();
+			if(tableView.SelectedColumn == -1) {
+				
+				MessageBox.ErrorQuery("No Column","No column selected", "Ok");
+				return;
+			}
+
+
+			try {
+				tableView.Table.Columns.RemoveAt(tableView.SelectedColumn);
+				tableView.Update();
+
+			} catch (Exception ex) {
+				MessageBox.ErrorQuery("Could not remove column",ex.Message, "Ok");
+			}
 		}
 
 		private void Align (TextAlignment newAlignment)