mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
fix a bug in the double file configuration loading
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
63c41801c9
commit
a208efdaf9
@ -537,6 +537,7 @@ bool p3Config::loadConfiguration(std::string &loadHash)
|
|||||||
bool pass = getHashAttempt(loadHash, hashstr, cfg_fname, load);
|
bool pass = getHashAttempt(loadHash, hashstr, cfg_fname, load);
|
||||||
|
|
||||||
if(!pass){
|
if(!pass){
|
||||||
|
load.clear();
|
||||||
pass = getHashAttempt(loadHash, hashstr, cfg_fname_backup, load);
|
pass = getHashAttempt(loadHash, hashstr, cfg_fname_backup, load);
|
||||||
#ifdef CONFIG_DEBUG
|
#ifdef CONFIG_DEBUG
|
||||||
std::cerr << "p3Config::loadConfiguration() ERROR: Failed to get Hash from " << success_fname << std::endl;
|
std::cerr << "p3Config::loadConfiguration() ERROR: Failed to get Hash from " << success_fname << std::endl;
|
||||||
|
Loading…
Reference in New Issue
Block a user