From 2af53bb703516361a07dfe4687dba9162a9a9ca5 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Thu, 12 Jan 2006 19:40:41 +0000
Subject: [PATCH] fix "illegal conversion; more than one user-defined
 conversion has been implicitly applied"

---
 stepmania/src/GameState.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index d8fda81ff4..77655546b1 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -773,11 +773,11 @@ CString GameState::GetPlayerDisplayName( PlayerNumber pn ) const
 		if( !PROFILEMAN->GetPlayerName(pn).empty() )
 			return PROFILEMAN->GetPlayerName(pn);
 		else
-			return *pDefaultNames[pn];
+			return pDefaultNames[pn]->GetValue();
 	}
 	else
 	{
-		return CPU;
+		return CPU.GetValue();
 	}
 }