From 0124c2e99d83cf44eedb1b737a37b44bf5d820b8 Mon Sep 17 00:00:00 2001
From: Len Ovens <len@ovenwerks.net>
Date: Wed, 10 May 2017 14:13:47 -0700
Subject: [PATCH] OSC: fix manual port setting to take effect on first incoming
 message

---
 libs/surfaces/osc/osc.cc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index f6c89005b7..d93e696a2a 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -1401,6 +1401,12 @@ OSC::get_surface (lo_address addr)
 {
 	string r_url;
 	char * rurl;
+	if (address_only) {
+		string host = lo_address_get_hostname (addr);
+		int protocol = lo_address_get_protocol (addr);
+		addr = lo_address_new_with_proto (protocol, host.c_str(), remote_port.c_str());
+	}
+
 	rurl = lo_address_get_url (addr);
 	r_url = rurl;
 	free (rurl);