! Use a slightly smarter test for whether a button is active or not.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #933 from Arantor/release-2.1

! Use a slightly smarter test for whether a button is active or not.