From 9439e9b1fd7b9ff2ddc2d80f8491f2688095b695 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sat, 6 Jan 2018 23:24:16 +0200 Subject: [PATCH 1/2] Fix a crash when resizing LVM LV. --- src/gui/newdialog.cpp | 5 +++++ src/gui/sizedialogbase.cpp | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/newdialog.cpp b/src/gui/newdialog.cpp index d97b8ee..b3c3dbc 100644 --- a/src/gui/newdialog.cpp +++ b/src/gui/newdialog.cpp @@ -101,6 +101,11 @@ void NewDialog::setupDialog() dialogWidget().checkBoxEncrypt().hide(); dialogWidget().editPassphrase().hide(); + if (device().type() == Device::LVM_Device) { + dialogWidget().comboFileSystem().removeItem(dialogWidget().comboFileSystem().findText(QStringLiteral("lvm2 pv"))); + } + + dialogWidget().editPassphrase().setMinimumPasswordLength(1); dialogWidget().editPassphrase().setMaximumPasswordLength(512); // cryptsetup does not support longer passwords diff --git a/src/gui/sizedialogbase.cpp b/src/gui/sizedialogbase.cpp index bc9d9b3..7a2d499 100644 --- a/src/gui/sizedialogbase.cpp +++ b/src/gui/sizedialogbase.cpp @@ -114,7 +114,6 @@ void SizeDialogBase::setupDialog() detailsWidget().checkAlign().setChecked(false); detailsWidget().checkAlign().setEnabled(false); detailsButton->hide(); - dialogWidget().comboFileSystem().removeItem(dialogWidget().comboFileSystem().findText(QStringLiteral("lvm2 pv"))); m_IsValidLVName = false; /* LVM logical volume name can consist of: letters numbers _ . - + From f469ef204ad23935bc08f7d74c9b8518d7ed54f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= Date: Sun, 7 Jan 2018 13:36:21 +0200 Subject: [PATCH 2/2] Bump version. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c865ea8..4c9a849 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ set(KPMCORE_MIN_VERSION "3.3.0") # Check KPMcore dependency when bumping set(VERSION_MAJOR "3") set(VERSION_MINOR "3") -set(VERSION_RELEASE "0") +set(VERSION_RELEASE "1") set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_RELEASE}) add_definitions(-D'VERSION="${VERSION}"') #"