mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
remove bug due to parameter handling, that resulted in random port at start
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6564 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
1c4f68bc60
commit
2afd22a2f0
@ -374,6 +374,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
|
|||||||
|
|
||||||
int c;
|
int c;
|
||||||
std::string prefUserString = "";
|
std::string prefUserString = "";
|
||||||
|
|
||||||
/* getopt info: every availiable option is listed here. if it is followed by a ':' it
|
/* getopt info: every availiable option is listed here. if it is followed by a ':' it
|
||||||
needs an argument. If it is followed by a '::' the argument is optional.
|
needs an argument. If it is followed by a '::' the argument is optional.
|
||||||
*/
|
*/
|
||||||
@ -406,7 +407,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
|
|||||||
if(RsInitConfig::autoLogin) RsInitConfig::startMinimised = true ;
|
if(RsInitConfig::autoLogin) RsInitConfig::startMinimised = true ;
|
||||||
if(RsInitConfig::outStderr) RsInitConfig::haveLogFile = false ;
|
if(RsInitConfig::outStderr) RsInitConfig::haveLogFile = false ;
|
||||||
if(!RsInitConfig::logfname.empty()) RsInitConfig::haveLogFile = true;
|
if(!RsInitConfig::logfname.empty()) RsInitConfig::haveLogFile = true;
|
||||||
if(!RsInitConfig::inet.empty()) RsInitConfig::forceLocalAddr = true;
|
if(RsInitConfig::inet != "127.0.0.1") RsInitConfig::forceLocalAddr = true;
|
||||||
#ifdef LOCALNET_TESTING
|
#ifdef LOCALNET_TESTING
|
||||||
if(!portRestrictions.empty()) doPortRestrictions = true;
|
if(!portRestrictions.empty()) doPortRestrictions = true;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user