mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
patch "Fix_ChannelNotificationFeedLink" from Phenom. Allows to finish loading a channel before jumping to the linked post
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6973 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
03c68c1276
commit
3b381b9d22
@ -30,6 +30,7 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
#include <time.h>
|
||||||
|
|
||||||
#include <retroshare/rsfiles.h>
|
#include <retroshare/rsfiles.h>
|
||||||
|
|
||||||
@ -852,6 +853,13 @@ bool ChannelFeed::navigate(const std::string& channelId, const std::string& msgI
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//update channel thread
|
||||||
|
updateChannelMsgs();
|
||||||
|
//Waiting thread finished
|
||||||
|
time_t now=time(NULL);
|
||||||
|
while(fillThread && ((now+300)>time(NULL)))
|
||||||
|
QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
|
||||||
|
|
||||||
/* Search exisiting item */
|
/* Search exisiting item */
|
||||||
QList<ChanMsgItem*>::iterator mit;
|
QList<ChanMsgItem*>::iterator mit;
|
||||||
for (mit = mChanMsgItems.begin(); mit != mChanMsgItems.end(); mit++) {
|
for (mit = mChanMsgItems.begin(); mit != mChanMsgItems.end(); mit++) {
|
||||||
|
Loading…
Reference in New Issue
Block a user