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

Merge pull request #384 from PhenomRetroShare/Fix_RsAccountsDetailPrivateInit

Browse source 
Fix Initialisation of Private in RsAccountDetails
This commit is contained in:
Cyril Soler 2016-05-14 10:57:52 -04:00
commit 5bb570e90e
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libretroshare/src/rsserver/rsaccounts.cc
View file

@ -59,14 +59,17 @@ RsAccountsDetail *rsAccounts;
static bool checkAccount(std::string accountdir, AccountDetails &account,std::map<std::string,std::vector<std::string> >& unsupported_keys);
AccountDetails::AccountDetails()
:mIsHiddenLoc(false), mFirstRun(false)
:mSslId(""), mAccountDir(""), mPgpId(""), mPgpName(""), mPgpEmail(""),
mLocation(""), mIsHiddenLoc(false), mFirstRun(false)
{
return;
}
RsAccountsDetail::RsAccountsDetail()
:mAccountsLocked(false)
:mAccountsLocked(false), mPreferredId(""), mBaseDirectory("")
{
mAccounts.clear();
mUnsupportedKeys.clear();
return;
}
@ -812,8 +815,8 @@ static bool checkAccount(std::string accountdir, AccountDetails &account,std::ma
#endif
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
if(!check)
return dataDirectory;
if (!check)
return dataDirectory;
/* Make sure the directory exists, else return emptyString */
if (!RsDirUtil::checkDirectory(dataDirectory))