New upstream version 2.3.3+dfsg.upstream/2.3.3+dfsg

1 files changed, 7 insertions, 0 deletions

diff --git a/src/cmd/barriers/barriers.cpp b/src/cmd/barriers/barriers.cpp
index cd67bcb..21c4d80 100644
--- a/src/cmd/barriers/barriers.cpp
+++ b/src/cmd/barriers/barriers.cpp
@@ -38,6 +38,13 @@ main(int argc, char** argv)
     // record window instance for tray icon, etc
     ArchMiscWindows::setInstanceWin32(GetModuleHandle(NULL));
 #endif
+
+#ifdef __APPLE__
+    /* Silence "is calling TIS/TSM in non-main thread environment" as it is a red
+    herring that causes a lot of issues to be filed for the MacOS client/server.
+    */
+    setenv("OS_ACTIVITY_DT_MODE", "NO", true);
+#endif
     
     Arch arch;
     arch.init();