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

Merge pull request #297 from PhenomRetroShare/Add_AllowOnlyOneIntanceAndPassArg

Browse source 
Allow only one instance. If exists, pass to it arguments.
This commit is contained in:
Cyril Soler 2016-04-07 00:09:00 -04:00
commit c8cae4c33c
19 changed files with 547 additions and 426 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libretroshare/src/retroshare/rsinit.h
View file

@ -98,8 +98,7 @@ class RsInit
* Post Login Options
*/
static bool getStartMinimised() ;
static std::string getRetroShareLink();
static bool getStartMinimised();
static int getSslPwdLen();
static bool getAutoLogin();

10
libretroshare/src/rsserver/rsinit.cc
View file

@ -128,8 +128,6 @@ class RsInitConfig
std::string load_trustedpeer_file;
bool udpListenerOnly;
std::string RetroShareLink;
};
static RsInitConfig *rsInitConfig = NULL;
@ -363,7 +361,8 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
>> parameter('p',"port" ,rsInitConfig->port ,"port", "Set listenning port to use." ,false)
>> parameter('c',"base-dir" ,opt_base_dir ,"directory", "Set base directory." ,false)
>> parameter('U',"user-id" ,prefUserString ,"ID", "[User Name/GPG id/SSL id] Sets Account to Use, Useful when Autologin is enabled",false)
>> parameter('r',"link" ,rsInitConfig->RetroShareLink ,"retroshare://...", "Use a given Retroshare Link" ,false)
// by rshare 'r' "link" "Link" "Open RsLink with protocol retroshare://"
// by rshare 'f' "rsfile" "RsFile" "Open RsFile like RsCollection"
#ifdef LOCALNET_TESTING
>> parameter('R',"restrict-port" ,portRestrictions ,"port1-port2","Apply port restriction" ,false)
#endif
@ -774,11 +773,6 @@ bool RsInit::getStartMinimised()
return rsInitConfig->startMinimised;
}
std::string RsInit::getRetroShareLink()
{
return rsInitConfig->RetroShareLink;
}
int RsInit::getSslPwdLen(){
return SSLPWD_LEN;
}