Reorder memcard loading to favor USB profiles over custom songs

diff --git a/src/GameState.cpp b/src/GameState.cpp
index 7e9d306..885d666 100755 (executable)
--- a/src/GameState.cpp
+++ b/src/GameState.cpp
@@ -366,13 +366,15 @@ void GameState::PlayersFinalized()
 
        MEMCARDMAN->LockCards();
 
-       // apply saved default modifiers if any
        FOREACH_HumanPlayer( pn )
        {
-               MEMCARDMAN->MountCard( pn );
-
+               MEMCARDMAN->MountCard( pn, 600 );
                PROFILEMAN->LoadFirstAvailableProfile( pn );    // load full profile
+       }
 
+       // apply saved default modifiers if any
+       FOREACH_HumanPlayer( pn )
+       {
                if (PREFSMAN->m_bCustomSongs && !GAMESTATE->IsCourseMode())
                {
                        SONGMAN->LoadPlayerSongs( pn );         // load custom songs, if any
@@ -385,7 +387,10 @@ void GameState::PlayersFinalized()
                }
 
                MEMCARDMAN->UnmountCard( pn );
+       }
 
+       FOREACH_HumanPlayer( pn )
+       {
                if( !PROFILEMAN->IsPersistentProfile(pn) )
                        continue;       // skip