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

moved rsGlobalShutDown from MainWindow::doQuit to main

Browse source 
rsGlobalShutDown now cleans the threads and some memory on exit

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-05-29 15:14:25 +00:00
parent b80aef1228
commit 334c9b61d3
13 changed files with 61 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -638,14 +638,12 @@ void MainWindow::doQuit()
if ((QMessageBox::question(this, tr("Really quit ? "),queryWrn,QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes)
{
rsicontrol->rsGlobalShutDown();
qApp->quit();
}
else
return;
return;
}
else
rsicontrol->rsGlobalShutDown();
rApp->quit();
}

3
retroshare-gui/src/main.cpp
View file

@ -180,10 +180,11 @@ int main(int argc, char *argv[])
timer->start(1000);
/* dive into the endless loop */
// return ret;
int ti = rshare.exec();
delete w ;
rsicontrol->rsGlobalShutDown();
Settings->sync();
delete Settings;