From fbc30002ab3438356c0476e70c4577a0310d52c0 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Tue, 21 Jul 2020 06:15:04 -0400
Subject: New upstream version 2.3.3+dfsg.

---
 src/cmd/barriers/barriers.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/cmd/barriers/barriers.cpp')

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();
-- 
cgit v1.2.3