diff framework/MainWindowBase.cpp @ 175:366f044c20e4 sv-v1.6

* Back out change from r1565, which may have been appropriate for
  "Sonic Segmenter" but isn't approprate for SV -- fixes #2812040
  The r1565 version is going into the MainWindow subclass for Sonic Segmenter
  instead.

--- a/framework/MainWindowBase.cpp	Thu Jun 25 13:30:37 2009 +0000
+++ b/framework/MainWindowBase.cpp	Mon Jun 29 13:06:49 2009 +0000
@@ -2636,12 +2636,8 @@
     // Check whether we need to add or remove model from play source
     Model *model = layer->getModel();
     if (model) {
-        Model *source = model->getSourceModel();
         if (inAView) {
             m_playSource->addModel(model);
-            if (source && source != model) {
-                m_playSource->addModel(source);
-            }
         } else {
             bool found = false;
             for (int i = 0; i < m_paneStack->getPaneCount(); ++i) {
@@ -2649,8 +2645,7 @@
                 if (!pane) continue;
                 for (int j = 0; j < pane->getLayerCount(); ++j) {
                     Layer *pl = pane->getLayer(j);
-                    if (pl && (pl->getModel() == model ||
-                               pl->getModel() == source)) {
+                    if (pl && (pl->getModel() == model)) {
                         found = true;
                         break;
                     }
@@ -2659,9 +2654,6 @@
             }
             if (!found) {
                 m_playSource->removeModel(model);
-                if (source && source != model) {
-                    m_playSource->removeModel(source);
-                }
             }
         }
     }