Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-21 05:39:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #52 from RetroShare/master

Browse source 
update to master
This commit is contained in:
defnax 2020-02-06 22:27:37 +01:00 • committed by GitHub
commit 8dd85f2391
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
87 changed files with 3462 additions and 619 deletions
Download patch file Download diff file Expand all files Collapse all files

2
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -472,7 +472,7 @@ void MainWindow::initStackedPage()
//List All notify before Setting was created
QList<QPair<MainPage*, QPair<QAction*, QListWidgetItem*> > >::iterator notifyIt;
for (notifyIt = notify.begin(); notifyIt != notify.end(); ++notifyIt) {
UserNotify *userNotify = notifyIt->first->getUserNotify(this);
UserNotify *userNotify = notifyIt->first->getUserNotify();
if (userNotify) {
userNotify->initialize(ui->toolBarPage, notifyIt->second.first, notifyIt->second.second);
connect(userNotify, SIGNAL(countChanged()), this, SLOT(updateTrayCombine()));