Unverified Commit be3901a8 authored by Don Gagne's avatar Don Gagne Committed by GitHub

Merge pull request #6456 from DonLakeFlyer/SliderCrash

FactValueSlider: Fix crash when empty
parents 893a9da2 8486840c
...@@ -701,7 +701,6 @@ FactValueSliderListModel* Fact::valueSliderModel(void) ...@@ -701,7 +701,6 @@ FactValueSliderListModel* Fact::valueSliderModel(void)
{ {
if (!_valueSliderModel) { if (!_valueSliderModel) {
_valueSliderModel = new FactValueSliderListModel(*this); _valueSliderModel = new FactValueSliderListModel(*this);
QQmlEngine::setObjectOwnership(_valueSliderModel, QQmlEngine::JavaScriptOwnership);
} }
return _valueSliderModel; return _valueSliderModel;
} }
...@@ -30,6 +30,7 @@ FactValueSliderListModel::FactValueSliderListModel(Fact& fact, QObject* parent) ...@@ -30,6 +30,7 @@ FactValueSliderListModel::FactValueSliderListModel(Fact& fact, QObject* parent)
, _initialValueRounded (0) , _initialValueRounded (0)
, _increment (0) , _increment (0)
{ {
QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
} }
FactValueSliderListModel::~FactValueSliderListModel() FactValueSliderListModel::~FactValueSliderListModel()
...@@ -38,10 +39,12 @@ FactValueSliderListModel::~FactValueSliderListModel() ...@@ -38,10 +39,12 @@ FactValueSliderListModel::~FactValueSliderListModel()
int FactValueSliderListModel::resetInitialValue(void) int FactValueSliderListModel::resetInitialValue(void)
{ {
// Remove any old rows if (_cValues > 0) {
beginRemoveRows(QModelIndex(), 0, _cValues - 1); // Remove any old rows
_cValues = 0; beginRemoveRows(QModelIndex(), 0, _cValues - 1);
endRemoveRows(); _cValues = 0;
endRemoveRows();
}
_initialValue = _fact.cookedValue().toDouble(); _initialValue = _fact.cookedValue().toDouble();
_initialValueRounded = qRound(_initialValue); _initialValueRounded = qRound(_initialValue);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment