Merge branch 'master' into recommended_sidebar

This commit is contained in:
Jack Ha 2016-12-01 14:10:06 +01:00
commit 23f7a91b40
3 changed files with 13768 additions and 1 deletions

View file

@ -141,7 +141,7 @@ SettingItem
{
for(var i = 0; i < extruders_model.rowCount(); ++i)
{
if(extruders_model.getItem(i).index == propertyProvider.properties.value)
if(extruders_model.getItem(i).index == currentIndex)
{
control.color = extruders_model.getItem(i).color;
return;