Fix the "Apply" - "OK" problem in the viewproperties dialog (patch done by Rafael...

CCBUG: 163366

svn path=/trunk/KDE/kdebase/apps/; revision=820062

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index c0db408f2c6fa2e704e4505f95040d880997b67a..5922f835923364bd4cb153ad11a867b71fb47ad7 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -310,8 +310,12 @@ void ViewPropertiesDialog::configureAdditionalInfo()
 
 void ViewPropertiesDialog::applyViewProperties()
 {
 
 void ViewPropertiesDialog::applyViewProperties()
 {

-    const bool applyToSubFolders = m_isDirty &&
-                                   (m_applyToSubFolders != 0) &&
+    // if nothing changed in the dialog, we have nothing to apply
+    if (!m_isDirty) {
+        return;
+    }
+
+    const bool applyToSubFolders = (m_applyToSubFolders != 0) &&

                                    m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
         const QString text(i18nc("@info", "The view properties of all sub folders will be changed. Do you want to continue?"));
                                    m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
         const QString text(i18nc("@info", "The view properties of all sub folders will be changed. Do you want to continue?"));


@@ -327,8 +331,7 @@ void ViewPropertiesDialog::applyViewProperties()
         info->show();
     }
 
         info->show();
     }
 

-    const bool applyToAllFolders = m_isDirty &&
-                                   (m_applyToAllFolders != 0) &&
+    const bool applyToAllFolders = (m_applyToAllFolders != 0) &&

                                    m_applyToAllFolders->isChecked();
 
     // If the user selected 'Apply To All Folders' the view properties implicitely
                                    m_applyToAllFolders->isChecked();
 
     // If the user selected 'Apply To All Folders' the view properties implicitely