[PC-BSD Commits] r7880 - in pcbsd: current/src-qt4/pc-sysinstaller stable/SysInstaller

[svn at pcbsd.org]

Author: kris
Date: 2010-10-22 10:34:30 -0700 (Fri, 22 Oct 2010)
New Revision: 7880

Modified:
   pcbsd/current/src-qt4/pc-sysinstaller/dialogFileSystem.cpp
   pcbsd/stable/SysInstaller/dialogFileSystem.cpp
Log:

Dont enable the encryption checkbox if user fat-fingers passphrase



Modified: pcbsd/current/src-qt4/pc-sysinstaller/dialogFileSystem.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysinstaller/dialogFileSystem.cpp	2010-10-22 17:29:32 UTC (rev 7879)
+++ pcbsd/current/src-qt4/pc-sysinstaller/dialogFileSystem.cpp	2010-10-22 17:34:30 UTC (rev 7880)
@@ -104,8 +104,7 @@
 void dialogFileSystem::slotEncryptionChanged()
 {
   if(checkEncryption->isChecked() && comboDiskType->currentText() != "SWAP" ) {
-    if( getEncPhrase() )
-      checkEncryptionZFS->setChecked(TRUE);
+    checkEncryptionZFS->setChecked(getEncPhrase());
   } else {
     encPhrase=""; 
     checkEncryptionZFS->setChecked(FALSE);
@@ -116,8 +115,7 @@
 void dialogFileSystem::slotEncryptionChangedZFS()
 {
   if(checkEncryptionZFS->isChecked() ) {
-    if( getEncPhrase() )
-      checkEncryption->setChecked(TRUE);
+    checkEncryption->setChecked(getEncPhrase());
   } else {
     encPhrase=""; 
     checkEncryption->setChecked(FALSE);

Modified: pcbsd/stable/SysInstaller/dialogFileSystem.cpp
===================================================================
--- pcbsd/stable/SysInstaller/dialogFileSystem.cpp	2010-10-22 17:29:32 UTC (rev 7879)
+++ pcbsd/stable/SysInstaller/dialogFileSystem.cpp	2010-10-22 17:34:30 UTC (rev 7880)
@@ -103,8 +103,7 @@
 void dialogFileSystem::slotEncryptionChanged()
 {
   if(checkEncryption->isChecked() && comboDiskType->currentText() != "SWAP" ) {
-    if( getEncPhrase() )
-      checkEncryptionZFS->setChecked(TRUE);
+    checkEncryptionZFS->setChecked(getEncPhrase());
   } else {
     encPhrase=""; 
     checkEncryptionZFS->setChecked(FALSE);
@@ -115,8 +114,7 @@
 void dialogFileSystem::slotEncryptionChangedZFS()
 {
   if(checkEncryptionZFS->isChecked() ) {
-    if( getEncPhrase() )
-      checkEncryption->setChecked(TRUE);
+    checkEncryption->setChecked(getEncPhrase());
   } else {
     encPhrase=""; 
     checkEncryption->setChecked(FALSE);