mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
Added check of account directory (check for missing subdirectories) in RsInit::InitRetroShare
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8362 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
00921b969e
commit
70d37d0306
@ -101,7 +101,16 @@ void RsAccountsDetail::unlockPreferredAccount()
|
||||
{
|
||||
mAccountsLocked = false;
|
||||
}
|
||||
|
||||
|
||||
bool RsAccountsDetail::checkAccountDirectory()
|
||||
{
|
||||
if (!checkPreferredId())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return setupAccount(PathAccountDirectory());
|
||||
}
|
||||
|
||||
bool RsAccountsDetail::selectAccountByString(const std::string &prefUserString)
|
||||
{
|
||||
|
@ -71,6 +71,7 @@ class RsAccountsDetail
|
||||
bool loadAccounts();
|
||||
bool lockPreferredAccount();
|
||||
void unlockPreferredAccount();
|
||||
bool checkAccountDirectory();
|
||||
|
||||
// Paths.
|
||||
static std::string PathDataDirectory();
|
||||
|
@ -488,7 +488,6 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
|
||||
// Hash the main executable.
|
||||
|
||||
uint64_t tmp_size ;
|
||||
std::string tmp_name ;
|
||||
|
||||
if(!RsDirUtil::getFileHash(argv[0],rsInitConfig->main_executable_hash,tmp_size,NULL))
|
||||
std::cerr << "Cannot hash executable! Plugins will not be loaded correctly." << std::endl;
|
||||
@ -984,6 +983,15 @@ int RsServer::StartupRetroShare()
|
||||
flags |= PQIPERSON_NO_LISTENER;
|
||||
}
|
||||
|
||||
/* check account directory */
|
||||
if (!rsAccounts->checkAccountDirectory())
|
||||
{
|
||||
std::cerr << "RsServer::StartupRetroShare() - Fatal Error....." << std::endl;
|
||||
std::cerr << "checkAccount failed!" << std::endl;
|
||||
std::cerr << std::endl;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**************************************************************************/
|
||||
// Load up Certificates, and Old Configuration (if present)
|
||||
std::cerr << "Load up Certificates, and Old Configuration (if present)." << std::endl;
|
||||
|
Loading…
Reference in New Issue
Block a user