mirror of
https://github.com/overte-org/overte.git
synced 2025-04-23 11:33:30 +02:00
destroy modal dialogs that prevent interface from getting input
This commit is contained in:
parent
9a4b95faa2
commit
d1e376de0e
3 changed files with 5 additions and 21 deletions
interface/resources/qml/dialogs
|
@ -273,11 +273,7 @@ ModalWindow {
|
|||
onTriggered: {
|
||||
root.result = null;
|
||||
root.canceled();
|
||||
// FIXME we are leaking memory to avoid a crash
|
||||
// root.destroy();
|
||||
|
||||
root.disableFade = true
|
||||
visible = false;
|
||||
root.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -299,11 +295,7 @@ ModalWindow {
|
|||
}
|
||||
root.result = JSON.stringify(result);
|
||||
root.selected(root.result);
|
||||
// FIXME we are leaking memory to avoid a crash
|
||||
// root.destroy();
|
||||
|
||||
root.disableFade = true
|
||||
visible = false;
|
||||
root.destroy();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -815,7 +815,7 @@ ModalWindow {
|
|||
Action {
|
||||
id: cancelAction
|
||||
text: "Cancel"
|
||||
onTriggered: { canceled(); root.shown = false; }
|
||||
onTriggered: { canceled(); root.destroy(); }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -168,11 +168,7 @@ ModalWindow {
|
|||
shortcut: "Esc"
|
||||
onTriggered: {
|
||||
root.canceled();
|
||||
// FIXME we are leaking memory to avoid a crash
|
||||
// root.destroy();
|
||||
|
||||
root.disableFade = true
|
||||
visible = false;
|
||||
root.destroy();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -183,11 +179,7 @@ ModalWindow {
|
|||
onTriggered: {
|
||||
root.result = items ? comboBox.currentText : textResult.text
|
||||
root.selected(root.result);
|
||||
// FIXME we are leaking memory to avoid a crash
|
||||
// root.destroy();
|
||||
|
||||
root.disableFade = true
|
||||
visible = false;
|
||||
root.destroy();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue