Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-14 03:52:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed endless loop at startup of RetroShare, with a wrong definition of a smiley string in emotes.acs.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3498 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-09-15 14:32:09 +00:00
parent 00ef48b45d
commit 8348e2a556
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
retroshare-gui/src/gui/common/Emoticons.cpp
View file

@ -91,7 +91,6 @@ void Emoticons::load()
{
smcode += sm_codes[i];
i++;
}
i++;
@ -107,6 +106,10 @@ void Emoticons::load()
}
i++;
if(!smcode.isEmpty() && !smfile.isEmpty()) {
while (smcode.right(1) == "|") {
smcode.remove(smcode.length() - 1, 1);
}
if (internalEmoticons) {
Smileys.insert(smcode, ":/"+smfile);
} else {