Fixes issue where currentButtonType was not being updated

Unless I'm missing something, the currentButtonType would never change after being animated.
Merge pull request #1 from brandonroeder/master

Fixes issue where currentButtonType was not being updated