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

fixed re-login after wrong passwd. Patch from Electron

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7669 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-11-08 19:31:16 +00:00
parent f7f1da01b5
commit 04b3b432e8
3 changed files with 24 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -96,6 +96,11 @@ bool RsAccountsDetail::lockPreferredAccount()
return false;
}
void RsAccountsDetail::unlockPreferredAccount()
{
mAccountsLocked = false;
}
bool RsAccountsDetail::selectAccountByString(const std::string &prefUserString)
@ -1196,45 +1201,6 @@ bool RsInit::LoadPassword(const std::string& id, const std::string& inPwd)
}
#endif
std::string RsAccountsDetail::getHomePath()
{
std::string home;
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
#ifndef WINDOWS_SYS /* UNIX */
home = getenv("HOME");
#else /* Windows */
char *h2 = getenv("HOMEDRIVE");
char *h3 = getenv("HOMEPATH");
if(!h2)
{
// Might be Win95/98
// generate default.
home = "C:\\Retro";
}
else
{
home = h2;
home += h3;
home += "\\Desktop";
}
std::cerr << "fltkserver::getHomePath() -> " << home << std::endl;
// convert to desired format.
home = RsDirUtil::convertPathToUnix(home);
#endif
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
return home;
}
/*********************************************************************************
* PUBLIC INTERFACE FUNCTIONS
********************************************************************************/