Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 13:24:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

destroy modal dialogs that prevent interface from getting input

Browse source
This commit is contained in:
danteruiz 2019-03-07 14:26:47 -08:00
parent 9a4b95faa2
commit d1e376de0e
3 changed files with 5 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/resources/qml/dialogs/CustomQueryDialog.qml
View file

@ -273,11 +273,7 @@ ModalWindow {
onTriggered: { onTriggered: {
root.result = null; root.result = null;
root.canceled(); root.canceled();
// FIXME we are leaking memory to avoid a crash root.destroy();
// root.destroy();
root.disableFade = true
visible = false;
} }
} }
@ -299,11 +295,7 @@ ModalWindow {
} }
root.result = JSON.stringify(result); root.result = JSON.stringify(result);
root.selected(root.result); root.selected(root.result);
// FIXME we are leaking memory to avoid a crash root.destroy();
// root.destroy();
root.disableFade = true
visible = false;
} }
} }
} }

2
interface/resources/qml/dialogs/FileDialog.qml
View file

@ -815,7 +815,7 @@ ModalWindow {
Action { Action {
id: cancelAction id: cancelAction
text: "Cancel" text: "Cancel"
onTriggered: { canceled(); root.shown = false; } onTriggered: { canceled(); root.destroy(); }
} }
} }

12
interface/resources/qml/dialogs/QueryDialog.qml
View file

@ -168,11 +168,7 @@ ModalWindow {
shortcut: "Esc" shortcut: "Esc"
onTriggered: { onTriggered: {
root.canceled(); root.canceled();
// FIXME we are leaking memory to avoid a crash root.destroy();
// root.destroy();
root.disableFade = true
visible = false;
} }
} }
@ -183,11 +179,7 @@ ModalWindow {
onTriggered: { onTriggered: {
root.result = items ? comboBox.currentText : textResult.text root.result = items ? comboBox.currentText : textResult.text
root.selected(root.result); root.selected(root.result);
// FIXME we are leaking memory to avoid a crash root.destroy();
// root.destroy();
root.disableFade = true
visible = false;
} }
} }
} }