diff options
| author |   Unit 193 <unit193@unit193.net> | 2020-07-21 06:15:16 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2020-07-21 06:15:16 -0400 |
| commit | 37a7155ea7c504b308a8afa642c653a12bbe5f84 (patch) | |
| tree | bd68ea5d2a2400dcd04b1aa85617534e66aba94c /src/cmd/barriers/barriers.cpp | |
| parent | 1ae09e76cde035d716763fc88b570535884cd50f (diff) | |
| parent | fbc30002ab3438356c0476e70c4577a0310d52c0 (diff) | |
Update upstream source from tag 'upstream/2.3.3+dfsg'
Update to upstream version '2.3.3+dfsg'
with Debian dir f7eeed313bc1a4c2bda69f04f0316ee29651397f
Diffstat (limited to 'src/cmd/barriers/barriers.cpp')
| -rw-r--r-- | src/cmd/barriers/barriers.cpp | 7 |
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(); |