From 179735fcd1deaed68ca8a05c74a0f2036798c238 Mon Sep 17 00:00:00 2001 From: Milan Hanajik Date: Mon, 23 Sep 2019 07:15:32 +0200 Subject: [PATCH] Bug fix : Program crashed when on-screen result items were defined for the first time on a PC (columnWidths == null). --- Results/Forms/OneWMResultsColumnsCtrl.cs | 4 ++-- Results/Forms/OneWMResultsRowsCtrl.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Results/Forms/OneWMResultsColumnsCtrl.cs b/Results/Forms/OneWMResultsColumnsCtrl.cs index c0cc28ad7..268e3da92 100644 --- a/Results/Forms/OneWMResultsColumnsCtrl.cs +++ b/Results/Forms/OneWMResultsColumnsCtrl.cs @@ -90,11 +90,11 @@ namespace Results.Forms #endif /// Header - lView.Columns.Add(wmPosition.ToString(), (columnWidths.Length > 0) ? columnWidths[0] : 40); + lView.Columns.Add(wmPosition.ToString(), (columnWidths != null && columnWidths.Length > 0) ? columnWidths[0] : 40); int col = 1; foreach (var str in wMtr.GetAllDecoratedTestNames()) { - lView.Columns.Add(str, (columnWidths.Length > col) ? columnWidths[col] : 70); + lView.Columns.Add(str, (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : 70); col++; } diff --git a/Results/Forms/OneWMResultsRowsCtrl.cs b/Results/Forms/OneWMResultsRowsCtrl.cs index 4fdf85265..627cd7743 100644 --- a/Results/Forms/OneWMResultsRowsCtrl.cs +++ b/Results/Forms/OneWMResultsRowsCtrl.cs @@ -67,13 +67,13 @@ namespace Results.Forms /// Always draw ListView header lView.Columns.Clear(); - lView.Columns.Add(wmPosition.ToString(), (columnWidths.Length > 0) ? columnWidths[0] : 40); + lView.Columns.Add(wmPosition.ToString(), (columnWidths != null && columnWidths.Length > 0) ? columnWidths[0] : 40); if (items == null || items.Count == 0) return; int col = 1; foreach (var item in items) { - lView.Columns.Add(item.Caption, (columnWidths.Length > col) ? columnWidths[col] : 70); + lView.Columns.Add(item.Caption, (columnWidths != null && columnWidths.Length > col) ? columnWidths[col] : 70); col++; } }