X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fmusic-iterator.cc;h=dabcccfb25aaeb4b56160e550155df72ab18338c;hb=4b78ea65daabcab3c4b6baf90fdd6f98aa186917;hp=ed778323b9ed1bad88beb219b91ad76120c2465a;hpb=90d3233da87b372e02690978f89b2add3863fba6;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index ed778323b9..dabcccfb25 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -30,7 +30,6 @@ using namespace std;
 #include "music-wrapper-iterator.hh"
 #include "simple-music-iterator.hh"
 
-ADD_SMOB_INIT (Music_iterator);
 
 Music_iterator::Music_iterator ()
 {
@@ -133,9 +132,12 @@ Music_iterator::init_context (Music *m, Context *report)
 void
 Music_iterator::substitute_outlet (Context *f, Context *t)
 {
-  if (get_outlet () == f)
-    set_context (t);
-  derived_substitute (f, t);
+  if (f != t)
+    {
+      if (get_outlet () == f)
+        set_context (t);
+      derived_substitute (f, t);
+    }
 }
 
 void