summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-12 11:47:36 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-04-12 11:47:36 +0200
commit76f14b0655a20b30bad49db4cd69f293b52349bf (patch)
tree2ef52e6def3c2ce3c284b7741729e455fd334c81
parenta547334afca38baae64e0f5774b1eb7f082a08e3 (diff)
parent4b95cfe79b2a3b005b47d2d8e0b4a4bc9344196a (diff)
downloadsink-76f14b0655a20b30bad49db4cd69f293b52349bf.tar.gz
sink-76f14b0655a20b30bad49db4cd69f293b52349bf.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--common/log.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/common/log.cpp b/common/log.cpp
index 9dd0365..045b3cc 100644
--- a/common/log.cpp
+++ b/common/log.cpp
@@ -200,6 +200,8 @@ QByteArrayList Sink::Log::debugOutputFilter(FilterType type)
200 return config()->value("applicationfilter").value<QByteArrayList>(); 200 return config()->value("applicationfilter").value<QByteArrayList>();
201 case Area: 201 case Area:
202 return config()->value("areafilter").value<QByteArrayList>(); 202 return config()->value("areafilter").value<QByteArrayList>();
203 default:
204 return QByteArrayList();
203 } 205 }
204} 206}
205 207