Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 16:39:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed merging with upstream/master

Browse Source
This commit is contained in:
csoler 2018-10-05 21:38:36 +02:00
commit ec8e8ebafa
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libretroshare/src/gxstrans/p3gxstrans.cc
View File

@ -33,7 +33,8 @@ const uint32_t p3GxsTrans::MAX_DELAY_BETWEEN_CLEANUPS = 900; // every 15 mins. C
p3GxsTrans::~p3GxsTrans() p3GxsTrans::~p3GxsTrans()
{ {
p3Config::saveConfiguration(); // (cyril) this cannot be called here! There's chances the thread that saves configs will be dead already!
//p3Config::saveConfiguration();
{ {
RS_STACK_MUTEX(mIngoingMutex); RS_STACK_MUTEX(mIngoingMutex);

2
libretroshare/src/pqi/p3cfgmgr.cc
View File

@ -340,7 +340,6 @@ bool p3Config::saveConfiguration()
bool p3Config::saveConfig() bool p3Config::saveConfig()
{ {
bool cleanup = true; bool cleanup = true;
std::list<RsItem *> toSave; std::list<RsItem *> toSave;
saveList(cleanup, toSave); saveList(cleanup, toSave);
@ -355,6 +354,7 @@ bool p3Config::saveConfig()
std::string cfgFname = Filename(); std::string cfgFname = Filename();
std::string signFname = Filename() + ".sgn"; std::string signFname = Filename() + ".sgn";
std::cerr << "(II) Saving configuration file " << cfgFname << std::endl;
uint32_t bioflags = BIN_FLAGS_HASH_DATA | BIN_FLAGS_WRITEABLE; uint32_t bioflags = BIN_FLAGS_HASH_DATA | BIN_FLAGS_WRITEABLE;
uint32_t stream_flags = BIN_FLAGS_WRITEABLE; uint32_t stream_flags = BIN_FLAGS_WRITEABLE;