OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5277 from OPM/guard-null-pointer-access

Browse Source 
Ensemble : Guard null pointer access causing crash
This commit is contained in:
Magne Sjaastad 2020-01-03 08:37:29 +01:00 committed by GitHub
commit 5bcaed594b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -185,7 +185,10 @@ RimEnsembleCurveSet::~RimEnsembleCurveSet()
if ( parentPlot && parentPlot->viewer() ) if ( parentPlot && parentPlot->viewer() )
{ {
m_qwtPlotCurveForLegendText->detach(); m_qwtPlotCurveForLegendText->detach();
parentPlot->viewer()->removeOverlayFrame( m_legendOverlayFrame ); if ( m_legendOverlayFrame )
{
parentPlot->viewer()->removeOverlayFrame( m_legendOverlayFrame );
}
} }
if ( m_legendOverlayFrame ) if ( m_legendOverlayFrame )
{ {

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -1232,7 +1232,7 @@ void RimSummaryPlot::deleteCurves( const std::vector<RimSummaryCurve*>& curves )
if ( curveSet->curves().empty() ) if ( curveSet->curves().empty() )
{ {
if ( curveSet->colorMode() == RimEnsembleCurveSet::ColorMode::BY_ENSEMBLE_PARAM && if ( curveSet->colorMode() == RimEnsembleCurveSet::ColorMode::BY_ENSEMBLE_PARAM &&
m_plotWidget ) m_plotWidget && curveSet->legendFrame() )
{ {
m_plotWidget->removeOverlayFrame( curveSet->legendFrame() ); m_plotWidget->removeOverlayFrame( curveSet->legendFrame() );
} }

2
ApplicationCode/UserInterface/RiuQwtPlotWidget.cpp
View File

@ -426,6 +426,8 @@ void RiuQwtPlotWidget::addOverlayFrame( RiuDraggableOverlayFrame* overlayFrame )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuQwtPlotWidget::removeOverlayFrame( RiuDraggableOverlayFrame* overlayFrame ) void RiuQwtPlotWidget::removeOverlayFrame( RiuDraggableOverlayFrame* overlayFrame )
{ {
CAF_ASSERT( overlayFrame );
overlayFrame->hide(); overlayFrame->hide();
overlayFrame->setParent( nullptr ); overlayFrame->setParent( nullptr );
m_overlayFrames.removeOne( overlayFrame ); m_overlayFrames.removeOne( overlayFrame );