[Aptitude-svn-commit] r4302 - in branches/aptitude-0.3/aptitude: . src

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 21:47:00 2005
New Revision: 4302

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Clear the 'active download' flag when a download fails up-front.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Mon Sep 26 21:47:00 2005
@@ -2,6 +2,11 @@
 
 	* src/ui.cc:
 
+	  Also clear the 'active download' flag after a download that
+	  failed up-front.
+
+	* src/ui.cc:
+
 	  If the download preparation routine fails, tell the download
 	  manager that the download was complete so that the download
 	  widget is destroyed.

Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc	Mon Sep 26 21:47:00 2005
@@ -990,7 +990,10 @@
 			 sigc::bind(sigc::ptr_fun(&finish_install_or_remove_packages),
 				    acq, pm, m, st, abort_state)))->start();
   else
-    m->Complete();
+    {
+      m->Complete();
+      active_download = false;
+    }
 }
 
 static void finish_install_or_remove_packages(download_thread *t,
@@ -1357,7 +1360,10 @@
     (new download_thread(acq, sigc::bind(sigc::ptr_fun(&finish_update_lists),
 					 acq, m, st)))->start();
   else
-    m->Complete();
+    {
+      m->Complete();
+      active_download = false;
+    }
 
   p->destroy();
 }