Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-09-20 12:54:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added parts of patch from Bogdan:

Browse source 
- Fixed assign with "==" instead of "=" in rsinit.cc
- Fixed double declare of variable item in GroupTreeWidget::calculateScore


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5.5@7417 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2014-06-29 19:23:16 +00:00
parent a4b79f2346
commit 9d95832f6e
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/rsserver/rsinit.cc
View file

@ -638,7 +638,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
if (!existingUser)
{
std::cerr << "No Existing User" << std::endl;
RsInitConfig::preferedId == "";
RsInitConfig::preferedId = "";
}

8
retroshare-gui/src/gui/common/GroupTreeWidget.cpp
View file

@ -503,15 +503,15 @@ void GroupTreeWidget::calculateScore(QTreeWidgetItem *item, const QString &filte
/* Find out which has given word in it */
QTreeWidgetItemIterator itemIterator(ui->treeWidget);
QTreeWidgetItem *item;
while ((item = *itemIterator) != NULL) {
QTreeWidgetItem *tmpItem;
while ((tmpItem = *itemIterator) != NULL) {
itemIterator++;
if (item->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
if (tmpItem->data(COLUMN_DATA, ROLE_ID).toString().isEmpty()) {
continue;
}
calculateScore(item, filterText);
calculateScore(tmpItem, filterText);
}
}