RowComponent should get the right parent to be destroyed at the right…

… time JASP crashes when closing the workspace if a TextArea was open in an Analysis form.
jasp-stats · Dec 13, 2023 · ce1eed4 · ce1eed4
1 parent 023ab81
commit ce1eed4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/QMLComponents/controls/jasplistcontrol.cpp b/QMLComponents/controls/jasplistcontrol.cpp
@@ -178,6 +178,9 @@ void JASPListControl::cleanUp()
 					control->cleanUp();
 		}
 
+		for (auto source : _sourceItems)
+			source->disconnectModels();
+
 		JASPControl::cleanUp();
 	}
 	catch (...) {}

diff --git a/QMLComponents/controls/rowcontrols.cpp b/QMLComponents/controls/rowcontrols.cpp
@@ -48,6 +48,7 @@ void RowControls::init(int row, const Term& key, bool isNew)
 	context->setContextProperty("rowValue", key.asQString());
 
 	_rowObject = qobject_cast<QQuickItem*>(_rowComponent->create(context));
+	_rowObject->setParent(_parentModel);
 	_context = context;
 
 	if (_rowObject)	_setupControls();