reinstate solo button for master out ; make solo button show state even if in listen...

[ardour.git] / libs / ardour / route.cc

diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index a6af898f38ab9333bb70e913007d9badb4067e7b..2eeaba176f8418750422e442a0c3a8af7330bd36 100644 (file)
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -1282,7 +1282,6 @@ Route::configure_processors_unlocked (ProcessorStreams* err)
        list< pair<ChanCount,ChanCount> >::iterator c = configuration.begin();
        for (ProcessorList::iterator p = _processors.begin(); p != _processors.end(); ++p, ++c) {
                (*p)->configure_io(c->first, c->second);
-               (*p)->activate();
                processor_max_streams = ChanCount::max(processor_max_streams, c->first);
                processor_max_streams = ChanCount::max(processor_max_streams, c->second);
                out = c->second;
@@ -1928,7 +1927,7 @@ Route::listen_via (boost::shared_ptr<Route> route, bool active)
                _control_outs = listener;
        }
 
-       add_processor (listener, PreFader);
+       add_processor (listener, (Config->get_listen_position() == AfterFaderListen ? PostFader : PreFader));
        
        return 0;
 }