More avatar related utf8 fixes.

2007-12-12 13:37:45 +00:00
parent 09a747bbf2
commit ee00741931
3 changed files with 15 additions and 5 deletions
@@ -454,7 +454,7 @@ ClientThread::SetPlayerInfo(unsigned id, const PlayerInfo &info)
 			string avatarFile;
 			if (GetAvatarManager().GetAvatarFileName(info.avatar, avatarFile))
 			{
-				playerData->SetAvatarFile(myQtToolsInterface->stringToUtf8(avatarFile));
+				playerData->SetAvatarFile(GetQtToolsInterface().stringToUtf8(avatarFile));
 			}
 		}
 	}
@@ -561,7 +561,7 @@ ClientThread::CompleteTempAvatarData(unsigned playerId)
 			if (GetAvatarManager().GetAvatarFileName(tmpPlayerInfo.avatar, fileName))
 			{
 				// Dynamically update avatar in GUI.
-				GetGui().setPlayerAvatar(playerId, fileName);
+				GetGui().setPlayerAvatar(playerId, GetQtToolsInterface().stringToUtf8(fileName));
 			}
 		}
 	}
@@ -680,6 +680,13 @@ ClientThread::GetSenderCallback()
 	return *m_senderCallback;
 }

+QtToolsInterface &
+ClientThread::GetQtToolsInterface()
+{
+	assert(myQtToolsInterface.get());
+	return *myQtToolsInterface;
+}
+
 void
 ClientThread::AddPlayerData(boost::shared_ptr<PlayerData> playerData)
 {