Changed: #1135 Some crashes under Linux
This commit is contained in:
parent
fec5b3f596
commit
b62ac30ebb
3 changed files with 15 additions and 8 deletions
code/ryzom/client/src
|
@ -967,7 +967,8 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
|
|||
}
|
||||
|
||||
ucstring cur_time;
|
||||
if (CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false)->getValueBool())
|
||||
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
||||
if (pNL && pNL->getValueBool())
|
||||
{
|
||||
cur_time = CInterfaceManager::getTimestampHuman();
|
||||
}
|
||||
|
@ -1008,7 +1009,8 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
|
|||
ucstring cur_time;
|
||||
if (cat.toString() != "&bbl&")
|
||||
{
|
||||
if (CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false)->getValueBool())
|
||||
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
||||
if (pNL && pNL->getValueBool())
|
||||
{
|
||||
cur_time = CInterfaceManager::getTimestampHuman();
|
||||
}
|
||||
|
@ -1183,11 +1185,13 @@ class CHandlerTell : public IActionHandler
|
|||
ucstring finalMsg;
|
||||
CChatWindow::encodeColorTag(prop.getRGBA(), finalMsg, false);
|
||||
ucstring cur_time;
|
||||
if (CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false)->getValueBool())
|
||||
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
||||
if (pNL && pNL->getValueBool())
|
||||
{
|
||||
cur_time = CInterfaceManager::getTimestampHuman();
|
||||
}
|
||||
ucstring csr = CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw()) ? "(CSR) " : "";
|
||||
ucstring csr;
|
||||
if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
|
||||
finalMsg += cur_time + csr + CI18N::get("youTell") + ": ";
|
||||
prop.readRGBA("UI:SAVE:CHAT:COLORS:TELL"," ");
|
||||
CChatWindow::encodeColorTag(prop.getRGBA(), finalMsg, true);
|
||||
|
|
|
@ -473,7 +473,8 @@ void CChatWindow::displayLocalPlayerTell(const ucstring &msg, uint numBlinks /*=
|
|||
prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
|
||||
encodeColorTag(prop.getRGBA(), finalMsg, false);
|
||||
ucstring cur_time;
|
||||
if (CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false)->getValueBool())
|
||||
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
||||
if (pNL && pNL->getValueBool())
|
||||
{
|
||||
cur_time = CInterfaceManager::getTimestampHuman();
|
||||
}
|
||||
|
|
|
@ -465,7 +465,8 @@ void CPeopleList::displayLocalPlayerTell(uint index,const ucstring &msg,uint num
|
|||
}
|
||||
|
||||
ucstring cur_time;
|
||||
if (CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false)->getValueBool())
|
||||
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
||||
if (pNL && pNL->getValueBool())
|
||||
{
|
||||
cur_time = CInterfaceManager::getTimestampHuman();
|
||||
}
|
||||
|
@ -936,7 +937,8 @@ class CHandlerContactEntry : public IActionHandler
|
|||
ucstring final;
|
||||
CChatWindow::encodeColorTag(prop.getRGBA(), final, false);
|
||||
ucstring cur_time;
|
||||
if (CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false)->getValueBool())
|
||||
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
||||
if (pNL && pNL->getValueBool())
|
||||
{
|
||||
cur_time = CInterfaceManager::getTimestampHuman();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue