Use only one version of set_current_state

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>