Fixed Waypoint loading/editing.

One more issue to fix in waypoint editing: When saving (or loading) it is adding one new unused waypoint.