release: 1.1.1

[lilypond.git] / lily / bar-engraver.cc

diff --git a/lily/bar-engraver.cc b/lily/bar-engraver.cc
index 7a2a515cdc7456684173e3bc28c71eb673bba4a5..456a13cf400387bb7dcc3d82481482b75b3128f7 100644 (file)
--- a/lily/bar-engraver.cc
+++ b/lily/bar-engraver.cc
@@ -23,16 +23,18 @@ Bar_engraver::Bar_engraver()
 bool
 Bar_engraver::do_try_request (Request*r_l)
 {
-  Command_req* c_l = dynamic_cast <Command_req *> (r_l);
-  if (!c_l|| !dynamic_cast <Bar_req *> (c_l)) 
-    return false;
-  Bar_req  * b= dynamic_cast <Bar_req *> (c_l);
-  if (bar_req_l_ && bar_req_l_->equal_b (b))
-    return false;
+  if (Bar_req  * b= dynamic_cast <Bar_req *> (r_l))
+    {
+      if (bar_req_l_ && bar_req_l_->equal_b (b)) // huh?
+       return false;
+      
+      bar_req_l_ = b;
+
+      return true;
+    }
   
-  bar_req_l_ = b;
+  return false;
 
-  return true;
 }
 
 void