Merge branch 'master' of github.com:Ultimaker/Cura

This commit is contained in:
Jaime van Kessel 2016-09-19 15:33:30 +02:00
commit f4cfe75ab1
2 changed files with 21 additions and 2 deletions

View file

@ -402,7 +402,18 @@ UM.MainWindow
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2
visible: base.monitoringPrint
source: Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage ? Cura.MachineManager.printerOutputDevices[0].cameraImage : ""
source:
{
if(!base.monitoringPrint)
{
return "";
}
if(Cura.MachineManager.printerOutputDevices.length > 0 && Cura.MachineManager.printerOutputDevices[0].cameraImage)
{
return Cura.MachineManager.printerOutputDevices[0].cameraImage;
}
return "";
}
}
UM.MessageStack