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

added lockfile path info to the multiple-instances warning window in rs-

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4098 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
chrisparker126 2011-03-16 23:25:57 +00:00
parent 49aad683b1
commit 2dd6581f14
5 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
retroshare-gui/src/gui/StartDialog.cpp
View file

@ -152,7 +152,8 @@ void StartDialog::loadPerson()
void StartDialog::loadCertificates()
{
/* Final stage of loading */
int retVal = RsInit::LockAndLoadCertificates(ui.autologin_checkbox->isChecked());
std::string lockFile;
int retVal = RsInit::LockAndLoadCertificates(ui.autologin_checkbox->isChecked(), lockFile);
switch(retVal)
{
case 0: close();
@ -161,12 +162,14 @@ void StartDialog::loadCertificates()
tr("Multiple instances"),
tr("Another RetroShare using the same profile is "
"already running on your system. Please close "
"that instance first, or choose another profile") );
"that instance first, or choose another profile\n"
"lock file:\n ")+ QString::fromStdString(lockFile));
break;
case 2: QMessageBox::warning( this,
tr("Multiple instances"),
tr("An unexpected error occurred when Retroshare"
"tried to acquire the single instance lock") );
"tried to acquire the single instance lock\n"
"lock file:\n ")+ QString::fromStdString(lockFile));
break;
case 3: QMessageBox::warning( this,
tr("Login Failure"),