fixed issue of loading the correct instance of RetroShare.conf when switching locations (Patch from AsamK #3423256)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4637 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2011-10-14 21:16:34 +00:00
parent 7a98e83df1
commit 6989a40312
6 changed files with 37 additions and 18 deletions

View file

@ -76,9 +76,9 @@
// the one and only global settings object
RshareSettings *Settings = NULL;
/*static*/ void RshareSettings::Create ()
/*static*/ void RshareSettings::Create(bool forceCreateNew)
{
if (Settings && Settings->m_bValid == false) {
if (Settings && (forceCreateNew || Settings->m_bValid == false)) {
// recreate with correct path
delete (Settings);
Settings = NULL;