Merge branch '3.0'

This commit is contained in:
Mark 2017-09-28 15:04:52 +02:00
commit fded206cc3
4 changed files with 19 additions and 10 deletions

View file

@ -217,7 +217,8 @@ UM.Dialog
{
base.visible = false
var item = machineList.model.getItem(machineList.currentIndex);
Cura.MachineManager.addMachine(machineName.text, item.id)
var defaultName = (item != undefined) ? item.name : ""
Cura.MachineManager.addMachine(machineName.text, item.id, defaultName)
base.machineAdded(item.id) // Emit signal that the user added a machine.
}