diff options
author | Olivier Goffart <ogoffart@woboq.com> | 2018-01-11 12:46:50 +0300 |
---|---|---|
committer | Olivier Goffart <ogoffart@woboq.com> | 2018-01-11 12:46:50 +0300 |
commit | 9613f6437d5fd87aee349b818a945319369e1cf0 (patch) | |
tree | 9e91dc2bc7caa3d5c6c0af7f0e83b7b3774ecd78 /src/gui/folderwizard.cpp | |
parent | 9dc765142cd1181aa95d730b8d8872910275d23e (diff) | |
parent | 7d70f1becb646040e2428c12bca9ec28596a50f8 (diff) |
Merge remote-tracking branch 'origin/2.4'
Conflicts:
src/libsync/networkjobs.cpp
Diffstat (limited to 'src/gui/folderwizard.cpp')
-rw-r--r-- | src/gui/folderwizard.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp index e42a4dda8..549d2095f 100644 --- a/src/gui/folderwizard.cpp +++ b/src/gui/folderwizard.cpp @@ -568,10 +568,12 @@ void FolderWizard::resizeEvent(QResizeEvent *event) QWizard::resizeEvent(event); // workaround for QTBUG-22819: when the error label word wrap, the minimum height is not adjusted - int hfw = currentPage()->heightForWidth(currentPage()->width()); - if (currentPage()->height() < hfw) { - currentPage()->setMinimumSize(currentPage()->minimumSizeHint().width(), hfw); - setTitleFormat(titleFormat()); // And another workaround for QTBUG-3396 + if (auto page = currentPage()) { + int hfw = page->heightForWidth(page->width()); + if (page->height() < hfw) { + page->setMinimumSize(page->minimumSizeHint().width(), hfw); + setTitleFormat(titleFormat()); // And another workaround for QTBUG-3396 + } } } |