Do not try to restore Route solo state after clearing all solo state

[ardour.git] / gtk2_ardour / track_selection.h

diff --git a/gtk2_ardour/track_selection.h b/gtk2_ardour/track_selection.h
index 5f85bcfd5866e73323abe38df7b104aeb3edfa9e..2e9927ab420ad89a82e535c7a3eaa0eeab4e2266 100644 (file)
--- a/gtk2_ardour/track_selection.h
+++ b/gtk2_ardour/track_selection.h
@@ -34,7 +34,7 @@ public:
        TrackSelection (PublicEditor const *, TrackViewList const &);
 
        virtual ~TrackSelection ();
-       
+
        TrackViewList add (TrackViewList const &);
 
        template <typename Function>
@@ -46,44 +46,57 @@ 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;
                }
        }
-       
+
 private:
        PublicEditor const * _editor;
 };