Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #946 from PhenomRetroShare/Fix_GuiAutoLogin

Browse Source 
Fix GUI AutoLogin
This commit is contained in:
csoler 2017-07-26 13:50:21 +02:00 committed by GitHub
commit 1792273cff
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libretroshare/src/rsserver/rsinit.cc
View File

@ -499,15 +499,13 @@ int RsInit::InitRetroShare(int _argc, char **_argv, bool /* strictCheck */)
} }
} }
#ifdef TO_REMOVE #ifdef RS_AUTOLOGIN
/* check that we have selected someone */ /* check that we have selected someone */
RsPeerId preferredId; RsPeerId preferredId;
bool existingUser = rsAccounts->getPreferredAccountId(preferredId); bool existingUser = rsAccounts->getPreferredAccountId(preferredId);
if (existingUser) if (existingUser)
{ {
if (rsInitConfig->passwd != "")
if(RsLoginHandler::getSSLPassword(preferredId,false,rsInitConfig->passwd)) if(RsLoginHandler::getSSLPassword(preferredId,false,rsInitConfig->passwd))
{ {
RsInit::setAutoLogin(true); RsInit::setAutoLogin(true);
@ -516,6 +514,7 @@ int RsInit::InitRetroShare(int _argc, char **_argv, bool /* strictCheck */)
} }
} }
#endif #endif
return RS_INIT_OK; return RS_INIT_OK;
} }