Merge remote-tracking branch 'origin/patch-2018.08.2' into dev

This commit is contained in:
Magne Sjaastad
2019-09-13 16:51:03 +02:00
6 changed files with 44 additions and 28 deletions

View File

@@ -278,12 +278,12 @@ std::set<RifEclipseSummaryAddress> RimSummaryCaseCollection::ensembleSummaryAddr
}
}
if ( maxAddrIndex >= 0 )
{
const std::set<RifEclipseSummaryAddress>& addrs = m_cases[maxAddrIndex]->summaryReader()->allResultAddresses();
addresses.insert( addrs.begin(), addrs.end() );
}
return addresses;
if (maxAddrIndex >= 0 && m_cases[maxAddrIndex]->summaryReader())
{
const std::set<RifEclipseSummaryAddress>& addrs = m_cases[maxAddrIndex]->summaryReader()->allResultAddresses();
addresses.insert(addrs.begin(), addrs.end());
}
return addresses;
}
//--------------------------------------------------------------------------------------------------