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

Fixed: mFixedPassword remained empty after logging

Browse Source
This commit is contained in:
Konrad 2017-04-10 23:42:22 +02:00
parent e1350a0b34
commit 9402b8e239
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libresapi/src/api/RsControlModule.cpp
View File

@ -67,7 +67,7 @@ bool RsControlModule::askForPassword(const std::string &title, const std::string
mPrevIsBad = prev_is_bad; mPrevIsBad = prev_is_bad;
if(mFixedPassword != "") if(mFixedPassword != "")
{ {
password = mFixedPassword; password = mFixedPassword;
return true; return true;
} }
@ -80,7 +80,6 @@ bool RsControlModule::askForPassword(const std::string &title, const std::string
{ {
password = mPassword; password = mPassword;
mWantPassword = false; mWantPassword = false;
mPassword = "";
return true; return true;
} }
@ -95,8 +94,7 @@ bool RsControlModule::askForPassword(const std::string &title, const std::string
if(mPassword != "") if(mPassword != "")
{ {
password = mPassword; password = mPassword;
mPassword = "";
mWantPassword = false; mWantPassword = false;
mStateTokenServer->replaceToken(mStateToken); mStateTokenServer->replaceToken(mStateToken);
return true; return true;
@ -138,6 +136,7 @@ void RsControlModule::run()
bool login_ok = false; bool login_ok = false;
while(!login_ok) while(!login_ok)
{ {
mPassword = "";
// skip account selection if autologin is available // skip account selection if autologin is available
if(initResult != RS_INIT_HAVE_ACCOUNT) if(initResult != RS_INIT_HAVE_ACCOUNT)
setRunState(WAITING_ACCOUNT_SELECT); setRunState(WAITING_ACCOUNT_SELECT);
@ -190,10 +189,10 @@ void RsControlModule::run()
} }
mLoadPeerId.clear(); mLoadPeerId.clear();
mPassword = "";
} }
mFixedPassword = mPassword; mFixedPassword = mPassword;
mPassword = "";
setRunState(WAITING_STARTUP); setRunState(WAITING_STARTUP);