diff --git a/stepmania/src/MemoryCardManager.cpp b/stepmania/src/MemoryCardManager.cpp index 5c31334783..f6405363d2 100644 --- a/stepmania/src/MemoryCardManager.cpp +++ b/stepmania/src/MemoryCardManager.cpp @@ -645,7 +645,7 @@ bool MemoryCardManager::IsNameAvailable( PlayerNumber pn ) const return m_Device[pn].bIsNameAvailable; } -const RString& MemoryCardManager::GetName( PlayerNumber pn ) const +RString MemoryCardManager::GetName( PlayerNumber pn ) const { return m_Device[pn].sName; } diff --git a/stepmania/src/MemoryCardManager.h b/stepmania/src/MemoryCardManager.h index 085fa31dc5..0f8b176124 100644 --- a/stepmania/src/MemoryCardManager.h +++ b/stepmania/src/MemoryCardManager.h @@ -21,7 +21,7 @@ public: void Update( float fDelta ); MemoryCardState GetCardState( PlayerNumber pn ) const { return m_State[pn]; } - const RString& GetCardError( PlayerNumber pn ) const { return m_sError[pn]; } + RString GetCardError( PlayerNumber pn ) const { return m_sError[pn]; } void LockCards(); // prevent removing or changing of memory cards void UnlockCards(); @@ -40,7 +40,7 @@ public: bool PathIsMemCard( RString sDir ) const; bool IsNameAvailable( PlayerNumber pn ) const; - const RString& GetName( PlayerNumber pn ) const; + RString GetName( PlayerNumber pn ) const; const vector &GetStorageDevices() { return m_vStorageDevices; }