Skip to content

Commit 004ae93

Browse files
committed
Add extra null guard
1 parent 09914e2 commit 004ae93

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

src/ScalarAction.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ ScalarAction::ScalarAction(QObject* parent, const QString& title, const float& m
2929
if (auto scatterplotPlugin = dynamic_cast<ScatterplotPlugin*>(findPluginAncestor())) {
3030
auto positionDataset = scatterplotPlugin->getPositionDataset();
3131
auto scalarSourcePointsDataset = Dataset<Points>(getCurrentDataset());
32-
const auto numScalars = scalarSourcePointsDataset->getNumPoints();
33-
const auto numPositions = positionDataset->getNumPoints();
3432

35-
if (numScalars != numPositions) {
36-
emitSourceSelectionChanged = false;
33+
if (scalarSourcePointsDataset.isValid() && positionDataset.isValid()) {
34+
const auto numScalars = scalarSourcePointsDataset->getNumPoints();
35+
const auto numPositions = positionDataset->getNumPoints();
3736

38-
scatterplotPlugin->addNotification(QString("The number of points in the scalar source dataset does not match the number of points in the position dataset. (numPositions=%1, numScalars:%2)").arg(QString::number(numPositions), QString::number(numScalars)));
37+
if (numScalars != numPositions) {
38+
emitSourceSelectionChanged = false;
39+
40+
scatterplotPlugin->addNotification(QString("The number of points in the scalar source dataset does not match the number of points in the position dataset. (numPositions=%1, numScalars:%2)").arg(QString::number(numPositions), QString::number(numScalars)));
41+
}
3942
}
4043
}
4144
} else {

0 commit comments

Comments
 (0)