Commit c8ae486e authored by Martin Koller's avatar Martin Koller
Browse files

fix missing / char in constructing default socket path

REVIEW: 129350
parent 53e3e69f
......@@ -127,10 +127,10 @@ void Connection::doReconnect()
const QString defaultSocketDir = StandardDirs::saveDir("data");
if (mConnectionType == CommandConnection) {
const QString defaultSocketPath = defaultSocketDir % QStringLiteral("akonadiserver-cmd.socket");
const QString defaultSocketPath = defaultSocketDir % QStringLiteral("/akonadiserver-cmd.socket");
serverAddress = connectionSettings.value(QStringLiteral("Data/UnixPath"), defaultSocketPath).toString();
} else if (mConnectionType == NotificationConnection) {
const QString defaultSocketPath = defaultSocketDir % QStringLiteral("akonadiserver-ntf.socket");
const QString defaultSocketPath = defaultSocketDir % QStringLiteral("/akonadiserver-ntf.socket");
serverAddress = connectionSettings.value(QStringLiteral("Notifications/UnixPath"), defaultSocketPath).toString();
}
}
......@@ -141,7 +141,7 @@ void Connection::doReconnect()
mSocket = new QLocalSocket(this);
connect(mSocket, static_cast<void(QLocalSocket::*)(QLocalSocket::LocalSocketError)>(&QLocalSocket::error), this,
[this](QLocalSocket::LocalSocketError) {
qCWarning(AKONADICORE_LOG) << mSocket->errorString();
qCWarning(AKONADICORE_LOG) << mSocket->errorString() << mSocket->serverName();
Q_EMIT socketError(mSocket->errorString());
Q_EMIT socketDisconnected();
});
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment