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

List:       kde-commits
Subject:    kdesupport/kdewin-installer
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2008-01-25 20:14:03
Message-ID: 1201292043.317605.12404.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 766419 by chehrlic:

delete temporary file when download failed
don't show msg box when user cancel download

 M  +2 -0      gui/installerenginegui.cpp  
 M  +1 -1      shared/downloader.cpp  


--- trunk/kdesupport/kdewin-installer/gui/installerenginegui.cpp #766418:766419
@@ -736,6 +736,8 @@
     while (!m_canceled) {
         if (pkg->downloadItem ( m_downloader, type ))
             return true;
+        if(m_downloader->result() == Downloader::Aborted)
+            return false;
         QMessageBox::StandardButton result = QMessageBox::critical(
             m_parent,
             tr("Download failed"),
--- trunk/kdesupport/kdewin-installer/shared/downloader.cpp #766418:766419
@@ -216,7 +216,7 @@
   bool bRet = ( d->ret == CURLE_OK );
   m_result = d->cancel ? Aborted : bRet ? Finished : Failed;
 
-  if ( !d->fileName.isEmpty() ) {
+  if ( bRet && !d->fileName.isEmpty() ) {
     QTemporaryFile *tf = static_cast<QTemporaryFile*> ( d->ioDevice );
     QString fn = tf->fileName();
     tf->close();
[prev in list] [next in list] [prev in thread] [next in thread]