Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-12 19:12:28 -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

4
libretroshare/src/rsserver/p3face-config.cc
View file

@ -170,5 +170,7 @@ void RsServer::rsGlobalShutDown()
mChannels->cleanUpOldFiles();
ConfigFinalSave(); // save configuration before exit
mConnMgr->shutdown(); /* Handles UPnP */
}
join();
ftserver->StopThreads();
}

2
libretroshare/src/rsserver/p3face-server.cc
View file

@ -93,7 +93,7 @@ void RsServer::run()
int min = 0;
int loop = 0;
while(1)
while(m_bRun)
{
#ifndef WINDOWS_SYS
usleep((int) (timeDelta * 1000000));

1
libretroshare/src/rsserver/rsinit.cc
View file

@ -1508,7 +1508,6 @@ bool RsInit::RsStoreAutoLogin()
DataIn.cbData = cbDataInput;
DataEnt.pbData = pbDataEnt;
DataEnt.cbData = cbDataEnt;
LPWSTR pDescrOut = NULL;
CRYPTPROTECT_PROMPTSTRUCT prom;