From 2fdd441a1c41cfa994ac4d4627f256c1a22bf446 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 19 Dec 2015 10:09:03 +0200 Subject: [PATCH] Fixed issue #420. Crash, not able to to open Standard measurements tables. --HG-- branch : develop --- src/app/valentina/mainwindow.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 0734d3d73..055c09d9c 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -1192,8 +1192,16 @@ void MainWindow::LoadStandard() if (not mPath.isEmpty()) { - const int hIndex = gradationHeights->currentIndex(); - const int sIndex = gradationSizes->currentIndex(); + int hIndex = -1; + if (not gradationHeights.isNull()) + { + hIndex = gradationHeights->currentIndex(); + } + int sIndex = -1; + if (not gradationSizes.isNull()) + { + sIndex = gradationSizes->currentIndex(); + } if(LoadMeasurements(mPath)) { @@ -1213,12 +1221,12 @@ void MainWindow::LoadStandard() if (qApp->patternType() == MeasurementsType::Standard) { - if (hIndex != -1) + if (hIndex != -1 && not gradationSizes.isNull()) { gradationHeights->setCurrentIndex(hIndex); } - if (sIndex != -1) + if (sIndex != -1 && not gradationSizes.isNull()) { gradationSizes->setCurrentIndex(sIndex); }