From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 18 May 2004 22:31:39 +0000 (+0000)
Subject: (do_shift): also do nothing for the (0,2)
X-Git-Tag: release/2.3.2~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e3a4046eff9dc13ba7e092c59de0021dbd72cbf9;p=lilypond.git

(do_shift): also do nothing for the (0,2)
case.
---

diff --git a/ChangeLog b/ChangeLog
index 96c808f649..b9a2b11b81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-19  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+	* lily/rest-collision.cc (do_shift): also do nothing for the (0,2)
+	case.
+
 2004-05-18  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
 	* scm/stencil.scm (fontify-text): reinstate function
diff --git a/lily/rest-collision.cc b/lily/rest-collision.cc
index 490f17fbc6..98151137c3 100644
--- a/lily/rest-collision.cc
+++ b/lily/rest-collision.cc
@@ -150,7 +150,8 @@ Rest_collision::do_shift (Grob *me)
 	ordered_rests[d].sort (Note_column::shift_compare);
       } while (flip (&d) != LEFT);
       
-      if (ordered_rests[UP].size () + ordered_rests[DOWN].size () < 2)
+      if (ordered_rests[UP].size () < 1
+	  || ordered_rests[DOWN].size () < 1)
 	return SCM_UNSPECIFIED;
 
       Grob *common = common_refpoint_of_array (ordered_rests[DOWN], me, Y_AXIS);