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

[Daniel Burrows]

Author: dburrows
Date: Sat Sep 24 19:59:42 2005
New Revision: 4244

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/ui.cc
Log:
Fix do_next_solution_enabled().

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Sep 24 19:59:42 2005
@@ -1,5 +1,9 @@
 2005-09-24  Daniel Burrows  <dburrows at debian.org>
 
+	* src/ui.cc:
+
+	  Fix do_next_solution_enabled().
+
 	* src/generic/resolver_manager.cc, src/generic/resolver_manager.h:
 
 	  Eliminate out_of_solutions; use the solutions_exhausted member

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	Sat Sep 24 19:59:42 2005
@@ -1540,9 +1540,9 @@
   resolver_manager::state state = resman->state_snapshot();
 
   return
-    state.selected_solution < state.generated_solutions ||
-    (state.selected_solution == state.generated_solutions - 1 &&
-     !state.solutions_exhausted);
+    state.selected_solution < state.generated_solutions &&
+    !(state.selected_solution + 1 == state.generated_solutions &&
+      state.solutions_exhausted);
 }
 
 void do_next_solution()