From 0ee4855c643dcb341a1691e028a35dac9a02f52b Mon Sep 17 00:00:00 2001 From: John Lewin Date: Tue, 4 Oct 2016 18:35:24 -0700 Subject: [PATCH] Fix regression due to failure to set printer name --- .../PrinterConnections/SetupStepMakeModelName.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs index d9ec7bede..f8c064028 100644 --- a/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs +++ b/PrinterControls/PrinterConnections/SetupStepMakeModelName.cs @@ -237,10 +237,8 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections // Use ManufacturerDropList.SelectedLabel instead of activeMake to ensure the mapped Unicode values are picked up string mappedMakeText = printerManufacturerSelector.SelectedLabel; - string printerInputName = string.Format("{0} {1}", mappedMakeText, activeModel); - - var names = ProfileManager.Instance.ActiveProfiles.Where(p => p.Name.StartsWith(printerInputName)).Select(p => p.Name).ToList(); - printerInputName = agg_basics.GetNonCollidingName(names, printerInputName); + var existingPrinterNames = ProfileManager.Instance.ActiveProfiles.Select(p => p.Name); + printerNameInput.Text = agg_basics.GetNonCollidingName(existingPrinterNames, $"{mappedMakeText} {activeModel}"); } }); }