Merge remote-tracking branch 'origin/2.4'

 Conflicts:
	src/libsync/networkjobs.cpp

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
+        }
     }
 }