nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '1.2.3' into development

Browse source
This commit is contained in:
Lars Brubaker 2015-06-10 17:53:37 -07:00
commit 61605b866a
14 changed files with 411 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -201,7 +201,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
if (usingDefaultName)
{
string printerInputName = String.Format("{0} {1}", this.ActivePrinter.Make, this.ActivePrinter.Model);
string query = string.Format("SELECT Name FROM Printer WHERE Name LIKE \'{0}%\';", printerInputName);
string query = string.Format("SELECT Name FROM Printer WHERE Name LIKE \"{0}%\";", printerInputName);
var names = Datastore.Instance.dbSQLite.Query<sqlName>(query).Select(item => item.Name).ToList();
if (!names.Contains(printerInputName))