diff --git a/src/ProfileManager.cpp b/src/ProfileManager.cpp index df4c904daa..2e237a6c88 100644 --- a/src/ProfileManager.cpp +++ b/src/ProfileManager.cpp @@ -212,6 +212,16 @@ bool ProfileManager::LoadLocalProfileFromMachine( PlayerNumber pn ) return false; } + // Make sure the profile is currently not in use by another player + FOREACH_HumanPlayer( pl ) + { + if( PROFILEMAN->IsPersistentProfile(pl) && PROFILEMAN->GetProfile(pl) == PROFILEMAN->GetLocalProfile(sProfileID) ) + { + m_sProfileDir[pn] = ""; + return false; + } + } + m_sProfileDir[pn] = LocalProfileIDToDir( sProfileID ); m_bWasLoadedFromMemoryCard[pn] = false; m_bLastLoadWasFromLastGood[pn] = false;