second patch from Joe: fix a silly mistake with infinite stiff springs

diff --git a/lily/simple-spacer.cc b/lily/simple-spacer.cc
index f16e6070610152750213562cca1cbbd4bd15b9f3..9129361cbd86702f3524bedec164a49aac27eee9 100644 (file)
--- a/lily/simple-spacer.cc
+++ b/lily/simple-spacer.cc
@@ -84,7 +84,7 @@ Simple_spacer::rod_force (int l, int r, Real dist)
   Real c = range_stiffness (l, r, dist > d);
   Real block_stretch = dist - d;
 
-  if (isinf (c)) /* take care of the 0*infinity_f case */
+  if (isinf (c) && block_stretch == 0) /* take care of the 0*infinity_f case */
     return 0;
   return c * block_stretch;
 }