3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 14:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge remote-tracking branch 'origin/master' into feature_model_list

Browse source
This commit is contained in:
Lipu Fei 2019-05-16 15:17:46 +02:00
commit 28172c9ad2
182 changed files with 31808 additions and 18294 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/PrinterSelector/MachineSelector.qml
View file

@ -32,9 +32,9 @@ Cura.ExpandablePopup
{
return Cura.MachineManager.activeMachineNetworkGroupName
}
if(Cura.MachineManager.activeStack != null)
if(Cura.MachineManager.activeMachine != null)
{
return Cura.MachineManager.activeStack.name
return Cura.MachineManager.activeMachine.name
}
return ""
}