CHG: Fixed two ancient bugs: Crash when pressing x, and geometry reload on Cancel