mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Meta: move qmConfig.clear().

Browse Source 
This moves the qmConfig.clear() call in MetaParams::read() to the
top of the function.

This allows the SSL part of MetaParams::read() to be moved out to a
separate function in the upcoming PR for live-reloading SSL settings
via the SIGUSR1 signal.
This commit is contained in:
Mikkel Krautz 2017-02-26 19:25:38 +01:00
parent f2ea3dec5f
commit 4fbbdda070
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/murmur/Meta.cpp
View File

@ -112,6 +112,8 @@ T MetaParams::typeCheckedFromSettings(const QString &name, const T &defaultValue
}
void MetaParams::read(QString fname) {
qmConfig.clear();
if (fname.isEmpty()) {
QStringList datapaths;
@ -507,7 +509,6 @@ void MetaParams::read(QString fname) {
qWarning("OpenSSL: %s", SSLeay_version(SSLEAY_VERSION));
qmConfig.clear();
QStringList hosts;
foreach(const QHostAddress &qha, qlBind) {
hosts << qha.toString();