OSC: Don't look for which stripable is selected until we actually need it, It may...

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 51746d1ce44807406061a042ffaaf08d338b1a93..68b51a96d0ee89213775c5bb317cad8c89d7dc3f 100644 (file)
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -260,23 +260,8 @@ OSC::start ()
        // order changed
        PresentationInfo::Change.connect (session_connections, MISSING_INVALIDATOR, boost::bind (&OSC::recalcbanks, this), this);
 
-       // guess at which stripable is the current editor mixerstrip
-       // right now just choose the first one we find, may be the wrong one
-       // hopefully we will have access to session->current_strip at some point
-       StripableList stripables;
-
-       session->get_stripables (stripables);
        _select = boost::shared_ptr<Stripable>();
 
-       for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
-               boost::shared_ptr<Stripable> s = *it;
-               if (s->is_selected()) {
-                       _select = s;
-                       break;
-               }
-       }
-
-
        return 0;
 }
 
@@ -1238,6 +1223,25 @@ OSC::get_surface (lo_address addr)
                        return &_surface[it];
                }
        }
+       // if we do this when OSC is started we get the wrong stripable
+       // we don't need this until we actually have a surface to deal with
+       if (!_select) {
+               // guess at which stripable is the current editor mixerstrip
+               // right now just choose the first one we find, may be the wrong one
+               // hopefully we will have access to session->current_strip at some point
+               StripableList stripables;
+
+               session->get_stripables (stripables);
+
+               for (StripableList::iterator it = stripables.begin(); it != stripables.end(); ++it) {
+                       boost::shared_ptr<Stripable> s = *it;
+                       if (s->is_selected()) {
+                               _select = s;
+                               break;
+                       }
+               }
+       }
+
        // No surface create one with default values
        OSCSurface s;
        s.remote_url = r_url;