Fix issue #649 (Autoedit not Persisting after Cancel for Canceled Cell)

This modification is fix for issue #649.

I modified if-statement to handle autoEdit case.