#3073 #3074 Fix crash and perpetual wait cursor when cancelling filtered ODB import

This commit is contained in:
Gaute Lindkvist
2018-06-21 13:56:10 +02:00
parent 6d3659dfe6
commit a888ab0160
4 changed files with 38 additions and 24 deletions

View File

@@ -122,7 +122,13 @@ void RimGeoMechView::onLoadDataAndUpdate()
if (m_geomechCase)
{
std::string errorMessage;
if (!m_geomechCase->openGeoMechCase(&errorMessage))
RimGeoMechCase::CaseOpenStatus status = m_geomechCase->openGeoMechCase(&errorMessage);
if (status == RimGeoMechCase::CASE_OPEN_CANCELLED)
{
m_geomechCase = nullptr;
return;
}
else if (status == RimGeoMechCase::CASE_OPEN_ERROR)
{
QString displayMessage = errorMessage.empty() ? "Could not open the Odb file: \n" + m_geomechCase->caseFileName() : QString::fromStdString(errorMessage);