Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJocelyn Turcotte <jturcotte@woboq.com>2016-12-08 19:30:41 +0300
committerJocelyn Turcotte <jturcotte@woboq.com>2016-12-09 12:03:46 +0300
commitf985111b6286a0c2ef4794495a6976f756a47776 (patch)
treed7f8e199fe9a2850c6b8b7481fa333436e0242fe /src/gui/logbrowser.cpp
parente8d734b1c2b6b5d489ef67ccae5d301072db396c (diff)
Fix the log window not showing csync logs
The csync log level was only set up on startup, and for log files. Fix the issue by making Logger::isNoop rely on being explicitly activated for the log window instead of relying on the presence of a connected signal, and move the csync log level logic in Logger.
Diffstat (limited to 'src/gui/logbrowser.cpp')
-rw-r--r--src/gui/logbrowser.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/logbrowser.cpp b/src/gui/logbrowser.cpp
index 18b249174..22e17f80d 100644
--- a/src/gui/logbrowser.cpp
+++ b/src/gui/logbrowser.cpp
@@ -110,8 +110,9 @@ LogBrowser::LogBrowser(QWidget *parent) :
setModal(false);
+ Logger::instance()->setLogWindowActivated(true);
// Direct connection for log coming from this thread, and queued for the one in a different thread
- connect(Logger::instance(), SIGNAL(newLog(QString)),this,SLOT(slotNewLog(QString)), Qt::AutoConnection);
+ connect(Logger::instance(), SIGNAL(logWindowLog(QString)),this,SLOT(slotNewLog(QString)), Qt::AutoConnection);
QAction *showLogWindow = new QAction(this);
showLogWindow->setShortcut(QKeySequence("F12"));