merge with master, with minor conflict fixes

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

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 4a392a8145ba85947bdadac633a8b2604d356987..8c12d44e5107518ec495ffe30d9b00b1ffdb4102 100644 (file)
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -397,7 +397,7 @@ Delivery::reset_panner ()
        if (panners_legal) {
                if (!_no_panner_reset) {
 
-                       if (_panshell && _role != Insert) {
+                       if (_panshell && _role != Insert && _role != Listen) {
                                _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs()));
                        }
                }