Browse Source

Empty collection check

Jamie D 5 years ago
parent
commit
34b7639fe4
1 changed files with 5 additions and 2 deletions
  1. 5 2
      Terminal.Gui/Core/View.cs

+ 5 - 2
Terminal.Gui/Core/View.cs

@@ -695,7 +695,9 @@ namespace Terminal.Gui {
 
 
 			while (subviews.Count > 0) {
 			while (subviews.Count > 0) {
 				Remove (subviews [0]);
 				Remove (subviews [0]);
-				Remove (tabIndexes [0]);
+				if (tabIndexes.Count > 0) {
+					Remove (tabIndexes [0]);
+				}
 			}
 			}
 		}
 		}
 
 
@@ -1186,7 +1188,8 @@ namespace Terminal.Gui {
 		{
 		{
 			var clipRect = new Rect (Point.Empty, frame.Size);
 			var clipRect = new Rect (Point.Empty, frame.Size);
 
 
-			Driver.SetAttribute (HasFocus ? ColorScheme.Focus : ColorScheme.Normal);
+			if (ColorScheme != null)
+				Driver.SetAttribute (HasFocus ? ColorScheme.Focus : ColorScheme.Normal);
 
 
 			if (!ustring.IsNullOrEmpty (Text)) {
 			if (!ustring.IsNullOrEmpty (Text)) {
 				Clear ();
 				Clear ();