X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmusic-iterator.cc;h=dabcccfb25aaeb4b56160e550155df72ab18338c;hb=c12086e5c8cfd3256914d12c715447d4b6716eff;hp=372a33ba1c8f7747b037b01c7b052d135f9e5012;hpb=8cd6c7945283badb27640b3a0020808ace14a27a;p=lilypond.git

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index 372a33ba1c..dabcccfb25 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -37,11 +37,6 @@ Music_iterator::Music_iterator ()
   smobify_self ();
 }
 
-Music_iterator::Music_iterator (Music_iterator const &)
-{
-  assert (false);
-}
-
 Music_iterator::~Music_iterator ()
 {
 }
@@ -137,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