Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-25 06:40:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed message loading bug due to currentIndex() not being ready when insertMessage() is called

Browse source
This commit is contained in:
csoler 2018-12-08 22:19:39 +01:00
parent 459c04a23e
commit d5928ca84e
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
1 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

18
retroshare-gui/src/gui/gxsforums/GxsForumThreadWidget.cpp
View file

@ -1034,8 +1034,14 @@ static QString getDurationString(uint32_t days)
void GxsForumThreadWidget::insertMessage() void GxsForumThreadWidget::insertMessage()
{ {
#ifdef DEBUG_FORUMS
std::cerr << "Inserting message, threadId=" << mThreadId <<std::endl;
#endif
if (groupId().isNull()) if (groupId().isNull())
{ {
#ifdef DEBUG_FORUMS
std::cerr << " groupId()=NULL !! That's a bug." << std::endl;
#endif
ui->versions_CB->hide(); ui->versions_CB->hide();
ui->time_label->show(); ui->time_label->show();
@ -1045,6 +1051,9 @@ void GxsForumThreadWidget::insertMessage()
if (mThreadId.isNull()) if (mThreadId.isNull())
{ {
#ifdef DEBUG_FORUMS
std::cerr << " mThreadId=NULL !! That's a bug." << std::endl;
#endif
ui->versions_CB->hide(); ui->versions_CB->hide();
ui->time_label->show(); ui->time_label->show();
@ -1052,7 +1061,9 @@ void GxsForumThreadWidget::insertMessage()
return; return;
} }
QModelIndex index = getCurrentIndex(); // We use this instead of getCurrentIndex() because right here the currentIndex() is not set yet.
QModelIndex index = mThreadProxyModel->mapFromSource(mThreadModel->getIndexOfMessage(mOrigThreadId));
if (index.isValid()) if (index.isValid())
{ {
@ -1063,6 +1074,9 @@ void GxsForumThreadWidget::insertMessage()
ui->previousButton->setEnabled(curr_index > 0); ui->previousButton->setEnabled(curr_index > 0);
ui->nextButton->setEnabled(curr_index < count - 1); ui->nextButton->setEnabled(curr_index < count - 1);
} else { } else {
#ifdef DEBUG_FORUMS
std::cerr << " current index invalid! That's a bug." << std::endl;
#endif
// there is something wrong // there is something wrong
ui->previousButton->setEnabled(false); ui->previousButton->setEnabled(false);
ui->nextButton->setEnabled(false); ui->nextButton->setEnabled(false);
@ -1159,8 +1173,8 @@ void GxsForumThreadWidget::insertMessageData(const RsGxsForumMsg &msg)
bool setToReadOnActive = Settings->getForumMsgSetToReadOnActivate(); bool setToReadOnActive = Settings->getForumMsgSetToReadOnActivate();
uint32_t status = msg.mMeta.mMsgStatus ;//item->data(RsGxsForumModel::COLUMN_THREAD_DATA, ROLE_THREAD_STATUS).toUInt(); uint32_t status = msg.mMeta.mMsgStatus ;//item->data(RsGxsForumModel::COLUMN_THREAD_DATA, ROLE_THREAD_STATUS).toUInt();
QModelIndex index = getCurrentIndex();
#ifdef TO_REMOVE #ifdef TO_REMOVE
QModelIndex index = getCurrentIndex();
if (IS_MSG_NEW(status)) { if (IS_MSG_NEW(status)) {
if (setToReadOnActive) { if (setToReadOnActive) {
/* set to read */ /* set to read */