It's a while since I have had your code in mind so I'm afraid your code snippet means nothing when presented out of context. You will need to supply the whole code - and some comments to mark your changes would help.
I thought in the code I suggested I had focused all the button reads into one function. It seem like you have relapsed into un-system.
...R