From 5b8ff5cd29ef0682ae76ad4875d7aff2e94b983c Mon Sep 17 00:00:00 2001 From: Matt Moening Date: Thu, 11 Aug 2016 13:01:34 -0700 Subject: [PATCH] Changed TryGetValue to ContainsKey for clarity --- SetupWizard/ImportSettingsPage.cs | 2 +- SlicerConfiguration/Settings/PrinterSettings.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/SetupWizard/ImportSettingsPage.cs b/SetupWizard/ImportSettingsPage.cs index a1d9b94de..33de84c32 100644 --- a/SetupWizard/ImportSettingsPage.cs +++ b/SetupWizard/ImportSettingsPage.cs @@ -594,7 +594,7 @@ namespace MatterHackers.MatterControl if(activeSettings.Contains(item.Key)) { containsValidSetting = true; - string currentValue = activeSettings.GetValue(item.Key, null).Trim(); + string currentValue = activeSettings.GetValue(item.Key).Trim(); // Compare the value to import to the layer cascade value and only set if different if (currentValue != item.Value) { diff --git a/SlicerConfiguration/Settings/PrinterSettings.cs b/SlicerConfiguration/Settings/PrinterSettings.cs index d72dfdad7..a25720020 100644 --- a/SlicerConfiguration/Settings/PrinterSettings.cs +++ b/SlicerConfiguration/Settings/PrinterSettings.cs @@ -379,8 +379,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration } foreach (PrinterSettingsLayer layer in layerCascade) { - string value; - if (layer.TryGetValue(sliceSetting, out value)) + if (layer.ContainsKey(sliceSetting)) { return true; }