#6081 #6114 Skirmish mode button fixed

Fixed issue where button would be disabled in skirmish mode too.