watcher:  restart after command only if running

After processing a command from the client, only restart the watcher if
the watcher was already running.  This allows the client to first set
options on the watcher before starting it.