1 files changed, 11 insertions, 1 deletions
diff --git a/tdeio/tdeio/tcpslavebase.cpp b/tdeio/tdeio/tcpslavebase.cpp
index e9707a76a..b4b3fa656 100644
--- a/tdeio/tdeio/tcpslavebase.cpp
+++ b/tdeio/tdeio/tcpslavebase.cpp
@@ -1095,7 +1095,13 @@ int TCPSlaveBase::verifyCertificate()
       TDEConfig *config = new TDEConfig("tdeioslaverc");
       config->setGroup("Notification Messages");
 
-      if (!config->readBoolEntry("WarnOnEnterSSLMode", true)) {
+      bool dialogBoxStatus = false;
+      if( config->hasKey("WarnOnEnterSSLMode") ) {
+          dialogBoxStatus = true;
+      }
+      bool keyStatus = config->readBoolEntry("WarnOnEnterSSLMode", true);
+      dialogBoxStatus = dialogBoxStatus && keyStatus;
+      if (!keyStatus) {
           config->deleteEntry("WarnOnEnterSSLMode");
           config->sync();
           d->kssl->settings()->setWarnOnEnter(false);
@@ -1122,6 +1128,10 @@ int TCPSlaveBase::verifyCertificate()
                        "showSSLInfoDialog(TQString,TDEIO::MetaData,int)",
                        data, ignoretype, ignore);
       }
+      //Laurent: If we disable message box we can't click on KMessageBox::No
+      if(dialogBoxStatus) {
+          break;
+      }
       } while (result != KMessageBox::No);
    }