Fixes issue where currentButtonType was not being updated

Unless I'm missing something, the currentButtonType would never change after being animated.