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

List:       kde-commits
Subject:    kdewebdev/klinkstatus/src/engine
From:       Paulo Moura Guedes <pmg () netcabo ! pt>
Date:       2004-06-01 1:00:51
Message-ID: 20040601010051.5F1D4126E0 () office ! kde ! org
[Download RAW message or body]

CVS commit by mojo: 

Fix Bug 82395 (http://bugs.kde.org/show_bug.cgi?id=82395).
Apparently, the bug was caused by trying to kill a job that already was killed or was \
in that process, but It's hard to tell.


  M +14 -7     linkchecker.cpp   1.13


--- kdewebdev/klinkstatus/src/engine/linkchecker.cpp  #1.12:1.13
@@ -86,7 +86,9 @@ void LinkChecker::slotTimeOut()
     {
         Q_ASSERT(t_job_);
-
+        if(not(t_job_->error() and t_job_->error() == KIO::ERR_USER_CANCELED))
+        {
         linkstatus_->setErrorOccurred(true);
         linkstatus_->setError("Timeout");
+            //kdDebug(23100) << "timeout: " << linkstatus_->absoluteUrl().url() << \
endl;  
         t_job_->kill(true); // quietly
@@ -95,5 +97,7 @@ void LinkChecker::slotTimeOut()
         finnish();
     }
+    }
 }
+
 void LinkChecker::slotMimetype (KIO::Job* /*job*/, const QString &type)
 {
@@ -247,5 +251,8 @@ void LinkChecker::slotResult(KIO::Job* /
     if(t_job_->error() and t_job_->error() == KIO::ERR_USER_CANCELED)
     {
-        kdWarning(23100) << "\n\nJob killed quietly, yet signal result was \
emited...\n\n\n"; +        kdWarning(23100) << endl << "Job killed quietly, yet \
signal result was emited..." << endl; +        kdDebug(23100) << \
linkstatus_->toString() << endl; +        t_job_ = 0;
+        finnish();
         return;
     }


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