protect use of iterators across routeUI selection when operations change the selectio...

diff --git a/gtk2_ardour/track_selection.h b/gtk2_ardour/track_selection.h
index d94ec3c8c1773bf39aa1edf6c09014a0704b35a9..2e9927ab420ad89a82e535c7a3eaa0eeab4e2266 100644 (file)
--- a/gtk2_ardour/track_selection.h
+++ b/gtk2_ardour/track_selection.h
@@ -46,41 +46,54 @@ public:
 
        template <typename Function>
        void foreach_route_ui (Function f) {
-               for (iterator i = begin(); i != end(); ++i) {
+               for (iterator i = begin(); i != end(); ) {
+                       iterator tmp = i;
+                       ++tmp;
+
                        RouteUI* t = dynamic_cast<RouteUI*> (*i);
                        if (t) {
                                f (t);
                        }
+                       i = tmp;
                }
        }
 
        template <typename Function>
        void foreach_route_time_axis (Function f) {
-               for (iterator i = begin(); i != end(); ++i) {
+               for (iterator i = begin(); i != end(); ) {
+                       iterator tmp = i;
+                       ++tmp;
                        RouteTimeAxisView* t = dynamic_cast<RouteTimeAxisView*> (*i);
                        if (t) {
                                f (t);
                        }
+                       i = tmp;
                }
        }
 
        template <typename Function>
        void foreach_audio_time_axis (Function f) {
-               for (iterator i = begin(); i != end(); ++i) {
+               for (iterator i = begin(); i != end(); ) {
+                       iterator tmp = i;
+                       ++tmp;
                        AudioTimeAxisView* t = dynamic_cast<AudioTimeAxisView*> (*i);
                        if (t) {
                                f (t);
                        }
+                       i = tmp;
                }
        }
 
        template <typename Function>
        void foreach_midi_time_axis (Function f) {
-               for (iterator i = begin(); i != end(); ++i) {
+               for (iterator i = begin(); i != end(); ) {
+                       iterator tmp = i;
+                       ++tmp;
                        MidiTimeAxisView* t = dynamic_cast<MidiTimeAxisView*> (*i);
                        if (t) {
                                f (t);
                        }
+                       i = tmp;
                }
        }