Fix for redundant thread contention in CsdNextMessage#3916

ericjbohm merged 2 commits intocharmplusplus:maincharmplusplus/charm:mainfrom

vladimir-polin:trylock_fixvladimir-polin/charm:trylock_fixCopy head branch name to clipboard