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

[Daniel Burrows]

Author: dburrows
Date: Wed Sep 21 02:00:47 2005
New Revision: 4144

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_table.cc
Log:
Tighten asserts.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Wed Sep 21 02:00:47 2005
@@ -1,5 +1,9 @@
 2005-09-20  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/vs_multiplex.cc, src/vscreen/vs_table.cc:
+
+	  Tighten some asserts.
+
 	* src/vscreen/vs_table.cc:
 
 	  Fix the logic that chooses a new focus after the current focus

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc	Wed Sep 21 02:00:47 2005
@@ -326,12 +326,13 @@
 	visible_child->w->focussed();
 
 
-      if(visible_child != old_visible)
-	{
-	  cycled();
-	  vscreen_queuelayout();
-	  vscreen_update();
-	}
+      // Since we just hid the previously-visible child, this MUST be
+      // the case.
+      assert(visible_child != old_visible);
+
+      cycled();
+      vscreen_queuelayout();
+      vscreen_update();
     }
 }
 

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_table.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_table.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_table.cc	Wed Sep 21 02:00:47 2005
@@ -267,10 +267,12 @@
 		  focus++;
 	      }
 
-	    if(focus != children.end() && get_isfocussed())
+	    if(focus != children.end())
 	      {
 		assert(focus != i);
-		focus->w->focussed();
+
+		if(get_isfocussed())
+		  focus->w->focussed();
 	      }
 	  }