Original implementation only checked whether the user had _selected_ the clock, not whether it had actually switched to the clock or not. For almost all cases, this made this function either a no-op, if you _had_ selected the clock, or a blocking loop if you hadn't selected it ahead of time. Fixes github issue #687