summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Loftis <ben@harrisonconsoles.com>2016-02-15 16:55:21 -0600
committerBen Loftis <ben@harrisonconsoles.com>2016-02-15 16:55:21 -0600
commit136f705af97021969408d37ed5c313ff0b778ec4 (patch)
treee6c5ac3ccf3df5cf74c463224837da15c6f401b2
parent14bf40cfe3b2cba29ea21eefb3025f4c347c2203 (diff)
Defer session_loaded until AFTER lo_server_new.
This seems like the right thing to do, and -might- fix OSC on Windows.
-rw-r--r--libs/surfaces/osc/osc.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 7308941ac7..0565e24f60 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -88,7 +88,6 @@ OSC::OSC (Session& s, uint32_t port)
{
_instance = this;
- session_loaded (s);
session->Exported.connect (*this, MISSING_INVALIDATOR, boost::bind (&OSC::session_exported, this, _1, _2), this);
}
@@ -227,6 +226,8 @@ OSC::start ()
register_callbacks();
+ session_loaded (@session);
+
// lo_server_thread_add_method(_sthread, NULL, NULL, OSC::_dummy_handler, this);
/* startup the event loop thread */