Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-13 16:39:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

removed mUpdating variable which was used for a safety test that is not relevant anymore and caused problems

Browse Source
This commit is contained in:
csoler 2018-12-09 23:25:59 +01:00
parent 34f51fff9c
commit 1dda7c5b34
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View File

@ -324,7 +324,7 @@ GxsForumThreadWidget::GxsForumThreadWidget(const RsGxsGroupId &forumId, QWidget
setUpdateWhenInvisible(true);
mUpdating = false;
//mUpdating = false;
mUnreadCount = 0;
mNewCount = 0;
@ -639,6 +639,7 @@ void GxsForumThreadWidget::updateDisplay(bool complete)
#ifdef DEBUG_FORUMS
std::cerr << "udateDisplay: groupId()=" << groupId()<< std::endl;
#endif
#ifdef TO_REMOVE
if(mUpdating)
{
#ifdef DEBUG_FORUMS
@ -646,6 +647,7 @@ void GxsForumThreadWidget::updateDisplay(bool complete)
#endif
return;
}
#endif
if(groupId().isNull())
{
@ -713,7 +715,7 @@ void GxsForumThreadWidget::updateDisplay(bool complete)
{
saveExpandedItems(mSavedExpandedMessages);
mUpdating=true;
//mUpdating=true;
updateGroupData();
mThreadModel->updateForum(groupId());
@ -955,8 +957,8 @@ void GxsForumThreadWidget::togglethreadview_internal()
void GxsForumThreadWidget::changedVersion()
{
if(mUpdating)
return;
//if(mUpdating)
// return;
mThreadId = RsGxsMessageId(ui->versions_CB->itemData(ui->versions_CB->currentIndex()).toString().toStdString()) ;
@ -966,8 +968,8 @@ void GxsForumThreadWidget::changedVersion()
void GxsForumThreadWidget::changedThread(QModelIndex index)
{
if(mUpdating)
return;
//if(mUpdating)
// return;
if(!index.isValid())
{
@ -1003,13 +1005,13 @@ void GxsForumThreadWidget::clickedThread(QModelIndex index)
std::cerr << "Clicked on message ID " << mThreadId << ", index=" << index << std::endl;
#endif
if(mUpdating)
{
#ifdef DEBUG_FORUMS
std::cerr << " early return because mUpdating=true" << std::endl;
#endif
return;
}
// if(mUpdating)
// {
//#ifdef DEBUG_FORUMS
// std::cerr << " early return because mUpdating=true" << std::endl;
//#endif
// return;
// }
if(!index.isValid())
{
@ -1772,7 +1774,7 @@ void GxsForumThreadWidget::postForumLoading()
ui->threadTreeWidget->update();
recursRestoreExpandedItems(mThreadProxyModel->mapFromSource(mThreadModel->root()),mSavedExpandedMessages);
mUpdating = false;
//mUpdating = false;
}
void GxsForumThreadWidget::updateGroupData()
{

2
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.h
View File

@ -177,7 +177,7 @@ private:
RsGxsMessageId mThreadId;
RsGxsMessageId mOrigThreadId;
RsGxsForumGroup mForumGroup;
bool mUpdating;
//bool mUpdating;
bool mInProcessSettings;
bool mInMsgAsReadUnread;
int mLastViewType;