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

Merge pull request #1064 from PhenomRetroShare/Fix_OpModeRestore

Browse source 
Fix OpMode Restore
This commit is contained in:
csoler 2017-11-03 23:49:30 +01:00 • committed by GitHub
commit 37f6e7e13b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -190,7 +190,7 @@ void RsInit::InitRsConfig()
rsInitConfig->passwd = ""; rsInitConfig->passwd = "";
rsInitConfig->debugLevel = PQL_WARNING; rsInitConfig->debugLevel = PQL_WARNING;
rsInitConfig->udpListenerOnly = false; rsInitConfig->udpListenerOnly = false;
rsInitConfig->opModeStr = std::string("FULL"); rsInitConfig->opModeStr = std::string("");
/* setup the homePath (default save location) */ /* setup the homePath (default save location) */
// rsInitConfig->homePath = getHomePath(); // rsInitConfig->homePath = getHomePath();

2
retroshare-gui/src/gui/MainWindow.cpp
View file

@ -1489,7 +1489,7 @@ void MainWindow::processLastArgs()
opModeStatus->setCurrentIndex(RS_OPMODE_GAMING - 1); opModeStatus->setCurrentIndex(RS_OPMODE_GAMING - 1);
} else if (opmode == "minimal") { } else if (opmode == "minimal") {
opModeStatus->setCurrentIndex(RS_OPMODE_MINIMAL - 1); opModeStatus->setCurrentIndex(RS_OPMODE_MINIMAL - 1);
} else { } else if (opmode != "") {
opModeStatus->setCurrentIndex(RS_OPMODE_FULL - 1); opModeStatus->setCurrentIndex(RS_OPMODE_FULL - 1);
} }
opModeStatus->setOpMode(); opModeStatus->setOpMode();