[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kcontrol/konqhtml
From:       George Staikos <staikos () kde ! org>
Date:       2005-02-22 19:20:12
Message-ID: 20050222192012.40D6EED8A () office ! kde ! org
[Download RAW message or body]

CVS commit by staikos: 

hack around this nastiness to avoid crashes and reentrancy.  yuck.
BUG: 99401


  M +13 -5     pluginopts.cpp   1.44


--- kdebase/kcontrol/konqhtml/pluginopts.cpp  #1.43:1.44
@@ -285,4 +285,5 @@ void KPluginOptions::slotShowDomainDlg()
 void KPluginOptions::scan()
 {
+    m_widget->scanButton->setEnabled(false);
     if ( m_changed ) {
         int ret = KMessageBox::warningYesNoCancel( this,
@@ -290,5 +291,8 @@ void KPluginOptions::scan()
                                                          "before the scan? Otherwise the "
                                                          "changes will be lost.") );
-        if ( ret==KMessageBox::Cancel ) return;
+        if ( ret==KMessageBox::Cancel ) {
+            m_widget->scanButton->setEnabled(true);
+            return;
+        }
         if ( ret==KMessageBox::Yes )
              save();
@@ -304,4 +308,5 @@ void KPluginOptions::scan()
                              i18n("The nspluginscan executable cannot be found. "
                                   "Netscape plugins will not be scanned.") );
+        m_widget->scanButton->setEnabled(true);
         return;
     }
@@ -326,8 +331,11 @@ void KPluginOptions::scan()
 
     // update dialog
+    if (m_progress) {
     m_progress->setProgress(100);
     load();
     delete m_progress;
     m_progress = 0;
+    }
+    m_widget->scanButton->setEnabled(true);
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]