fix country codes not being found for EAN13

barnhill · Jan 29, 2021 · b1c7180 · b1c7180
1 parent 4014ce5
commit b1c7180
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/BarcodeStandard/Symbologies/EAN13.cs b/BarcodeStandard/Symbologies/EAN13.cs
@@ -75,21 +75,28 @@ private string Encode_EAN13()
             _countryAssigningManufacturerCode = "N/A";
             var twodigitCode = Raw_Data.Substring(0, 2);
             var threedigitCode = Raw_Data.Substring(0, 3);
-            try
-            {
-                _countryAssigningManufacturerCode = _countryCodes[threedigitCode].ToString();
-            }//try
-            catch
+
+			try
             {
-                try
+				var cc = _countryCodes[threedigitCode];
+				if (cc == null)
                 {
-                    _countryAssigningManufacturerCode = _countryCodes[twodigitCode].ToString();
-                }//try
-                catch
+					cc = _countryCodes[twodigitCode].ToString();
+					if (cc == null)
+                    {
+						Error("EEAN13-3: Country assigning manufacturer code not found.");
+					} 
+					else
+                    {
+						_countryAssigningManufacturerCode = cc.ToString();
+					}
+				} 
+				else
                 {
-                    Error("EEAN13-3: Country assigning manufacturer code not found.");
-                }//catch 
-            }//catch
+					_countryAssigningManufacturerCode = cc.ToString();
+				}
+
+            }
             finally { _countryCodes.Clear(); }
 
             return result;