mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
(#629) Fixed crash when opening an Odb-file in no-odb version of ResInsight
This commit is contained in:
parent
ca5dc6e80a
commit
b356be9464
@ -97,10 +97,8 @@ RimGeoMechView* RimGeoMechCase::createAndAddReservoirView()
|
||||
bool RimGeoMechCase::openGeoMechCase(std::string* errorMessage)
|
||||
{
|
||||
// If read already, return
|
||||
|
||||
if (this->m_geoMechCaseData.notNull()) return true;
|
||||
|
||||
|
||||
if (!QFile::exists(m_caseFileName()))
|
||||
{
|
||||
return false;
|
||||
@ -108,7 +106,15 @@ bool RimGeoMechCase::openGeoMechCase(std::string* errorMessage)
|
||||
|
||||
m_geoMechCaseData = new RigGeoMechCaseData(m_caseFileName().toStdString());
|
||||
|
||||
return m_geoMechCaseData->openAndReadFemParts(errorMessage);
|
||||
bool fileOpenSuccess = m_geoMechCaseData->openAndReadFemParts(errorMessage);
|
||||
if (!fileOpenSuccess)
|
||||
{
|
||||
// If opening failed, release all data
|
||||
// Also, several places is checked for this data to validate availability of data
|
||||
m_geoMechCaseData = NULL;
|
||||
}
|
||||
|
||||
return fileOpenSuccess;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
Loading…
Reference in New Issue
Block a user