fix data races in controller

Fix #305
This is used to let people know when watch has completed, right? If so, let's call it something like condWatchCompleted.