From 4f7d856a1c0ac7849542e03065f26740c6f6d09e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 27 Mar 2018 09:28:55 -0700 Subject: [PATCH 1/2] don't free dialogs to avoid crash in setKeyboardRaised --- interface/resources/qml/dialogs/CustomQueryDialog.qml | 8 ++++++-- interface/resources/qml/dialogs/QueryDialog.qml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/dialogs/CustomQueryDialog.qml b/interface/resources/qml/dialogs/CustomQueryDialog.qml index 4d6fe74bca..6e1bb4b309 100644 --- a/interface/resources/qml/dialogs/CustomQueryDialog.qml +++ b/interface/resources/qml/dialogs/CustomQueryDialog.qml @@ -270,7 +270,9 @@ ModalWindow { onTriggered: { root.result = null; root.canceled(); - root.destroy(); + // FIXME we are leaking memory to avoid a crash + // root.destroy(); + visible = false; } } @@ -292,7 +294,9 @@ ModalWindow { } root.result = JSON.stringify(result); root.selected(root.result); - root.destroy(); + // FIXME we are leaking memory to avoid a crash + // root.destroy(); + visible = false; } } } diff --git a/interface/resources/qml/dialogs/QueryDialog.qml b/interface/resources/qml/dialogs/QueryDialog.qml index b5de5362f2..6f05179bd5 100644 --- a/interface/resources/qml/dialogs/QueryDialog.qml +++ b/interface/resources/qml/dialogs/QueryDialog.qml @@ -169,7 +169,9 @@ ModalWindow { shortcut: Qt.Key_Escape onTriggered: { root.canceled(); - root.destroy(); + // FIXME we are leaking memory to avoid a crash + // root.destroy(); + visible = false; } } Action { @@ -179,7 +181,9 @@ ModalWindow { onTriggered: { root.result = items ? comboBox.currentText : textResult.text root.selected(root.result); - root.destroy(); + // FIXME we are leaking memory to avoid a crash + // root.destroy(); + visible = false; } } } From bb101956a69ad5186bb854741f3c081839d2a73e Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Tue, 27 Mar 2018 18:25:43 -0700 Subject: [PATCH 2/2] fix entity importing --- interface/src/Application.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 968af3e298..7e6c65f8f4 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -959,8 +959,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning())); setProperty(hifi::properties::CRASHED, _previousSessionCrashed); - _entityClipboard->setIsServerlessMode(true); - { const QString TEST_SCRIPT = "--testScript"; const QString TRACE_FILE = "--traceFile";