diff options
| author | Sergey Chebotar <s.chebotar@gmail.com> | 2022-03-22 15:14:43 +0300 |
|---|---|---|
| committer | Sergey Chebotar <s.chebotar@gmail.com> | 2022-03-22 15:14:43 +0300 |
| commit | 5dcc91e4a13e35588a8b0dfc8fda391076122a0b (patch) | |
| tree | 91a8ef9db5fc5aa4781da28c190efa5d66782a1b | |
| parent | f190e27948255303c73a6b457ad1c3af1c88dba9 (diff) | |
Fix null reference error
| -rw-r--r-- | src/PriceListTools/AbstractTool.cs | 7 | ||||
| -rw-r--r-- | src/Properties/AssemblyInfo.cs | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/PriceListTools/AbstractTool.cs b/src/PriceListTools/AbstractTool.cs index 256be06..f312e95 100644 --- a/src/PriceListTools/AbstractTool.cs +++ b/src/PriceListTools/AbstractTool.cs @@ -135,7 +135,6 @@ namespace RehauSku.PriceListTools protected int? GetPositionRow(Range range, string sku, string group) { Range found = range.Find(sku); - string foundGroupValue; if (found == null) { @@ -146,9 +145,11 @@ namespace RehauSku.PriceListTools while (true) { - foundGroupValue = TargetFile.Sheet.Cells[found.Row, TargetFile.GroupCell.Column].Value2.ToString(); + Range groupCell = TargetFile.Sheet.Cells[found.Row, TargetFile.GroupCell.Column]; - if (string.IsNullOrEmpty(group) || group.Equals(foundGroupValue)) + if (string.IsNullOrEmpty(group) || + string.IsNullOrEmpty(groupCell.Value2.ToString()) || + group.Equals(groupCell.Value2.ToString())) { return found.Row; } diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index b348361..5f1731a 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4")] -[assembly: AssemblyFileVersion("1.0.4")] +[assembly: AssemblyVersion("1.0.4.1")] +[assembly: AssemblyFileVersion("1.0.4.1")] |