summaryrefslogtreecommitdiff
path: root/libs/surfaces/osc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2020-01-05 11:25:23 -0700
committerPaul Davis <paul@linuxaudiosystems.com>2020-01-05 11:25:36 -0700
commitbaf0cdcbef1b0fb67d625ae910a85c811f0a6262 (patch)
tree3161de12106af68fab360633f27263d28b773597 /libs/surfaces/osc
parentdba7421153db19ae15b0d2829ddc4f10ea07ed20 (diff)
fix handling of flags in the OSC input handler
Some builds of glib on macOS end up delivering IO_PRI when IO_IN is also set. This differs from our own build stack version, but it isn't really an error, so we should handle it.
Diffstat (limited to 'libs/surfaces/osc')
-rw-r--r--libs/surfaces/osc/osc.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 0926739ad3..666c1023c3 100644
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -684,14 +684,14 @@ OSC::register_callbacks()
bool
OSC::osc_input_handler (IOCondition ioc, lo_server srv)
{
- if (ioc & ~IO_IN) {
- return false;
- }
-
if (ioc & IO_IN) {
lo_server_recv (srv);
}
+ if (ioc & ~(IO_IN|IO_PRI)) {
+ return false;
+ }
+
return true;
}