Fix lock issue with workspace dialog

CURA-4405

- Add try-except around lock release
- Fix closing the dialog with ESC
This commit is contained in:
Lipu Fei 2017-10-09 15:04:27 +02:00
parent f8122320d4
commit 8a25605413
2 changed files with 25 additions and 4 deletions

View file

@ -10,6 +10,7 @@ import UM 1.1 as UM
UM.Dialog
{
id: base
title: catalog.i18nc("@title:window", "Open Project")
minimumWidth: 500 * screenScaleFactor
@ -30,6 +31,7 @@ UM.Dialog
materialResolveComboBox.currentIndex = 0
}
}
Item
{
anchors.fill: parent
@ -377,7 +379,7 @@ UM.Dialog
anchors.right: ok_button.left
anchors.rightMargin: 2 * screenScaleFactor
}
Button
Button
{
id: ok_button
text: catalog.i18nc("@action:button","Open");
@ -386,4 +388,10 @@ UM.Dialog
anchors.right: parent.right
}
}
function reject() {
manager.onCancelButtonClicked();
base.visible = false;
base.rejected();
}
}