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

Merge pull request #1329 from sehraf/pr_small-fixes

Browse Source 
small fixes
This commit is contained in:
csoler 2018-08-27 10:56:29 +02:00 committed by GitHub
commit fd25f8336e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/util/rsdebug.cc
View File

@ -142,11 +142,12 @@ void rslog(const RsLog::logLvl lvl, RsLog::logInfo *info, const std::string &msg
if(info->lvl == RsLog::None) if(info->lvl == RsLog::None)
return; return;
RsStackMutex stack(logMtx); /******** LOCKED ****************/
bool process = info->lvl == RsLog::Default ? (lvl <= defaultLevel) : lvl <= info->lvl; bool process = info->lvl == RsLog::Default ? (lvl <= defaultLevel) : lvl <= info->lvl;
if(process) if(!process)
return;
{ {
RsStackMutex stack(logMtx); /******** LOCKED ****************/
time_t t = time(NULL); time_t t = time(NULL);
if (debugMode == RS_DEBUG_LOGCRASH) if (debugMode == RS_DEBUG_LOGCRASH)
@ -179,6 +180,9 @@ void rslog(const RsLog::logLvl lvl, RsLog::logInfo *info, const std::string &msg
fprintf(ofd, "(%s Z: %s, lvl: %u): %s \n", fprintf(ofd, "(%s Z: %s, lvl: %u): %s \n",
timestr2.c_str(), info->name.c_str(), (unsigned int)info->lvl, msg.c_str()); timestr2.c_str(), info->name.c_str(), (unsigned int)info->lvl, msg.c_str());
fflush(ofd); fflush(ofd);
fprintf(stdout, "(%s Z: %s, lvl: %u): %s \n",
timestr2.c_str(), info->name.c_str(), (unsigned int)info->lvl, msg.c_str());
lineCount++; lineCount++;
} }
} }

5
retroshare-gui/src/gui/settings/ServerPage.cpp
View File

@ -191,7 +191,6 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
connect(ui.discComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses())); connect(ui.discComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
connect(ui.netModeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses())); connect(ui.netModeComboBox,SIGNAL(currentIndexChanged(int)),this,SLOT(saveAddresses()));
connect(ui.localAddress, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses())); connect(ui.localAddress, SIGNAL(textChanged(QString)),this,SLOT(saveAddresses()));
@ -231,6 +230,10 @@ ServerPage::ServerPage(QWidget * parent, Qt::WindowFlags flags)
QObject::connect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateRelayMode())); QObject::connect(ui.enableCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateRelayMode()));
QObject::connect(ui.serverCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateRelayMode())); QObject::connect(ui.serverCheckBox,SIGNAL(toggled(bool)),this,SLOT(updateRelayMode()));
// when the network menu is opened and the hidden service tab is already selected updateOutProxyIndicator() won't be called and thus resulting in wrong proxy indicators.
if (ui.tabWidget->currentIndex() == TAB_HIDDEN_SERVICE)
updateOutProxyIndicator();
} }
void ServerPage::saveAndTestInProxy() void ServerPage::saveAndTestInProxy()