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

[Daniel Burrows]

Author: dburrows
Date: Mon Sep 26 21:45:41 2005
New Revision: 4301

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Don't leave an immortal download progress widget behind if the 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:45:41 2005
@@ -1,5 +1,11 @@
 2005-09-26  Daniel Burrows  <dburrows at debian.org>
 
+	* 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.
+
 	* src/download.cc:
 
 	  If the user tries to start a download while the package cache is

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:45:41 2005
@@ -989,6 +989,8 @@
     (new download_thread(acq,
 			 sigc::bind(sigc::ptr_fun(&finish_install_or_remove_packages),
 				    acq, pm, m, st, abort_state)))->start();
+  else
+    m->Complete();
 }
 
 static void finish_install_or_remove_packages(download_thread *t,
@@ -1354,6 +1356,8 @@
   if(acq != NULL)
     (new download_thread(acq, sigc::bind(sigc::ptr_fun(&finish_update_lists),
 					 acq, m, st)))->start();
+  else
+    m->Complete();
 
   p->destroy();
 }