From baf0cdcbef1b0fb67d625ae910a85c811f0a6262 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Sun, 5 Jan 2020 11:25:23 -0700 Subject: [PATCH] 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. --- libs/surfaces/osc/osc.cc | 8 ++++---- 1 file 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; }