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

Merge pull request #414 from PhenomRetroShare/Add_MessageWhenSendingArgToOtherInstance

Browse Source 
Add message, when sending arguments to other instance, to disable this
This commit is contained in:
Cyril Soler 2016-06-14 20:31:38 -04:00 committed by GitHub
commit ceecdb2771
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retroshare-gui/src/gui/settings/GeneralPage.cpp
View File

@ -48,6 +48,7 @@ GeneralPage::GeneralPage(QWidget * parent, Qt::WindowFlags flags)
ui.chkRunRetroshareAtSystemStartup->setEnabled(false);
ui.chkRunRetroshareAtSystemStartupMinimized->setEnabled(false);
#endif
ui.desktopFileMissingLabel->setVisible(false);
#else
ui.chkRunRetroshareAtSystemStartup->setVisible(false);

3
retroshare-gui/src/rshare.cpp
View File

@ -167,6 +167,9 @@ Rshare::Rshare(QStringList args, int &argc, char **argv, const QString &dir)
std::cerr << "Rshare::Rshare Connection etablished. Waiting for disconnection." << std::endl;
localSocket.waitForDisconnected(1000);
newArgs.detach();
std::cerr << "Rshare::Rshare Arguments was sended." << std::endl
<< " To disable it, in Options - General - Misc," << std::endl
<< " uncheck \"Use Local Server to get new Arguments\"." << std::endl;
::exit(EXIT_SUCCESS); // Terminate the program using STDLib's exit function
}
newArgs.detach();