fixup a subtle problem in the replay_controller reset procedure

You can see that this must be done by reading display.cpp and
looking at the similar editor code that switches map contexts.
Merge branch 'master' of git://github.com/wesnoth/wesnoth