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

fixed conflict with master

Browse source
This commit is contained in:
csoler 2021-01-19 22:34:44 +01:00
commit f491e3c20e
61 changed files with 1202 additions and 892 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -377,7 +377,9 @@ MainWindow::~MainWindow()
delete sysTrayStatus;
delete trayIcon;
delete trayMenu;
// delete notifyMenu; // already deleted by the deletion of trayMenu
// delete notifyMenu; // already deleted by the deletion of trayMenu
StatisticsWindow::releaseInstance();
#ifdef MESSENGER_WINDOW
MessengerWindow::releaseInstance();
#endif