Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 13:24:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1890 from PhenomRetroShare/Fix_LogUserNotify

Browse Source 
Fix Log User Notify
This commit is contained in:
csoler 2020-05-02 15:56:08 +02:00 committed by GitHub
commit c601179b3c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -478,6 +478,9 @@ void MainWindow::initStackedPage()
} }
#endif #endif
addPage(newsFeed = new NewsFeed(ui->stackPages), grp, &notify);
//List All notify before Setting was created //List All notify before Setting was created
QList<QPair<MainPage*, QPair<QAction*, QListWidgetItem*> > >::iterator notifyIt; QList<QPair<MainPage*, QPair<QAction*, QListWidgetItem*> > >::iterator notifyIt;
for (notifyIt = notify.begin(); notifyIt != notify.end(); ++notifyIt) { for (notifyIt = notify.begin(); notifyIt != notify.end(); ++notifyIt) {
@ -489,7 +492,6 @@ void MainWindow::initStackedPage()
} }
} }
addPage(newsFeed = new NewsFeed(ui->stackPages), grp, &notify);
addPage(settingsDialog = new SettingsPage(ui->stackPages),grp,&notify); addPage(settingsDialog = new SettingsPage(ui->stackPages),grp,&notify);
/* Create the toolbar */ /* Create the toolbar */

2
retroshare-gui/src/gui/NewsFeed.cpp
View File

@ -494,7 +494,7 @@ void NewsFeed::addFeedItemIfUnique(FeedItem *item, bool replace)
} }
addFeedItem(item); addFeedItem(item);
sendNewsFeedChanged(); //sendNewsFeedChanged(); //Already done by addFeedItem()
} }
void NewsFeed::remUniqueFeedItem(FeedItem *item) void NewsFeed::remUniqueFeedItem(FeedItem *item)