From 7beac9db5bc472e75754c3508e4b8b3dec50b70c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sun, 22 Nov 2020 09:32:33 +0200 Subject: [PATCH] Fix Tape crash on opening. Closes #81 --- ChangeLog.txt | 1 + src/app/tape/tmainwindow.cpp | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 46757c1fe..b864e7f40 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,6 +1,7 @@ # Version 0.7.40 (unreleased) - New function Warning. - [smart-pattern/valentina#80] Allow insertion of multiple nodes. +- [smart-pattern/valentina#81] Tape crash on opening. # Version 0.7.39 Nov 17, 2020 - Fix crash for Line tool notes. diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index e02bdfe23..2733fb09b 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -635,9 +635,12 @@ void TMainWindow::changeEvent(QEvent *event) } { - labelPatternUnit->setText(tr("Pattern unit:")); + if (labelPatternUnit) + { + labelPatternUnit->setText(tr("Pattern unit:")); + } - if (comboBoxUnits != nullptr) + if (comboBoxUnits) { const qint32 index = comboBoxUnits->currentIndex(); comboBoxUnits->blockSignals(true); @@ -4302,6 +4305,11 @@ void TMainWindow::InitComboBoxUnits() //--------------------------------------------------------------------------------------------------------------------- void TMainWindow::InitMeasurementUnits() { + if (not m) + { + return; + } + ui->comboBoxMUnits->blockSignals(true); int current = -1;