Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Fixed Nasty Bug: Double Increment in TokenQueue list iteration => infinite Loop.

Browse Source 
* Corrected header file names.
 * Only queue TokenRequest if RankingRequest returns true.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5363 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2012-07-31 12:15:58 +00:00
parent 79957e96a9
commit e6c6ed9b91
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
retroshare-gui/src/gui/Posted/PostedListDialog.cpp
View File

@ -455,10 +455,11 @@ void PostedListDialog::requestGroupThreadData_InsertThreads(const std::string &g
//mPostedQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, grpIds, POSTEDDIALOG_INSERTTHREADS); //mPostedQueue->requestMsgInfo(token, RS_TOKREQ_ANSTYPE_DATA, opts, grpIds, POSTEDDIALOG_INSERTTHREADS);
// Do specific Posted Request.... // Do specific Posted Request....
rsPosted->requestRanking(token, groupId); if (rsPosted->requestRanking(token, groupId))
// get the Queue to handle response. {
mPostedQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_DATA, POSTEDDIALOG_INSERTTHREADS); // get the Queue to handle response.
mPostedQueue->queueRequest(token, TOKENREQ_MSGINFO, RS_TOKREQ_ANSTYPE_DATA, POSTEDDIALOG_INSERTTHREADS);
}
} }

2
retroshare-gui/src/gui/forumsv2/CreateForumV2.cpp
View File

@ -27,7 +27,7 @@
#include <algorithm> #include <algorithm>
#include <retroshare/rsforumsV2.h> #include <retroshare/rsforumsv2.h>
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>
#include <iostream> #include <iostream>

2
retroshare-gui/src/gui/forumsv2/CreateForumV2Msg.cpp
View File

@ -28,7 +28,7 @@
#include <QDropEvent> #include <QDropEvent>
#include <QPushButton> #include <QPushButton>
#include <retroshare/rsforumsV2.h> #include <retroshare/rsforumsv2.h>
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>
#include "gui/settings/rsharesettings.h" #include "gui/settings/rsharesettings.h"

2
retroshare-gui/src/gui/forumsv2/EditForumV2Details.cpp
View File

@ -21,7 +21,7 @@
#include "EditForumV2Details.h" #include "EditForumV2Details.h"
#include <retroshare/rsforumsV2.h> #include <retroshare/rsforumsv2.h>
#include "util/misc.h" #include "util/misc.h"

2
retroshare-gui/src/gui/forumsv2/ForumV2Details.cpp
View File

@ -23,7 +23,7 @@
#include <retroshare/rsiface.h> #include <retroshare/rsiface.h>
#include <retroshare/rspeers.h> #include <retroshare/rspeers.h>
#include <retroshare/rsdisc.h> #include <retroshare/rsdisc.h>
#include <retroshare/rsforumsV2.h> #include <retroshare/rsforumsv2.h>
#include <QTime> #include <QTime>
#include <QDateTime> #include <QDateTime>

2
retroshare-gui/src/gui/gxs/ForumV2GroupDialog.cpp
View File

@ -21,7 +21,7 @@
#include "ForumV2GroupDialog.h" #include "ForumV2GroupDialog.h"
#include <retroshare/rsforumsV2.h> #include <retroshare/rsforumsv2.h>
#include <iostream> #include <iostream>
ForumV2GroupDialog::ForumV2GroupDialog(QWidget *parent) ForumV2GroupDialog::ForumV2GroupDialog(QWidget *parent)

2
retroshare-gui/src/util/TokenQueue.cpp
View File

@ -104,7 +104,7 @@ void TokenQueue::pollRequests()
std::list<TokenRequest>::iterator it; std::list<TokenRequest>::iterator it;
double pollPeriod = 1.0; // max poll period. double pollPeriod = 1.0; // max poll period.
for(it = mRequests.begin(); it != mRequests.end(); it++) for(it = mRequests.begin(); it != mRequests.end();)
{ {
if (checkForRequest(it->mToken)) if (checkForRequest(it->mToken))
{ {