Patch by Geoff fixing command-line auto-advance, with a small fix by me

git-svn-id: svn://svn.code.sf.net/p/freeorion/code/trunk@7807 dbd5520b-6a0a-0410-a553-f54834df5b05