summaryrefslogtreecommitdiffstats
path: root/common/resourceaccess.cpp
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2015-04-29 01:11:40 +0200
committerChristian Mollekopf <chrigi_1@fastmail.fm>2015-04-29 01:11:40 +0200
commitb0e7af2972b82364f8ca95fef8031cbd018d54e0 (patch)
tree3f6f1aad825e1b02aa5d9a882730c1be85ba5023 /common/resourceaccess.cpp
parent3c0e79b1e9088e3b55f65fe5cc440ffb08dfde0a (diff)
downloadsink-b0e7af2972b82364f8ca95fef8031cbd018d54e0.tar.gz
sink-b0e7af2972b82364f8ca95fef8031cbd018d54e0.zip
Avoid starting the resource for shutdown.
Diffstat (limited to 'common/resourceaccess.cpp')
-rw-r--r--common/resourceaccess.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/common/resourceaccess.cpp b/common/resourceaccess.cpp
index c6d701d..28aaf2e 100644
--- a/common/resourceaccess.cpp
+++ b/common/resourceaccess.cpp
@@ -84,7 +84,7 @@ ResourceAccess::Private::Private(const QByteArray &name, ResourceAccess *q)
84} 84}
85 85
86//Connects to server and returns connected socket on success 86//Connects to server and returns connected socket on success
87static Async::Job<QSharedPointer<QLocalSocket> > connectToServer(const QByteArray &identifier) 87Async::Job<QSharedPointer<QLocalSocket> > ResourceAccess::connectToServer(const QByteArray &identifier)
88{ 88{
89 auto s = QSharedPointer<QLocalSocket>::create(); 89 auto s = QSharedPointer<QLocalSocket>::create();
90 return Async::start<QSharedPointer<QLocalSocket> >([identifier, s](Async::Future<QSharedPointer<QLocalSocket> > &future) { 90 return Async::start<QSharedPointer<QLocalSocket> >([identifier, s](Async::Future<QSharedPointer<QLocalSocket> > &future) {
@@ -161,7 +161,9 @@ ResourceAccess::ResourceAccess(const QByteArray &resourceName, QObject *parent)
161 161
162ResourceAccess::~ResourceAccess() 162ResourceAccess::~ResourceAccess()
163{ 163{
164 164 if (!d->resultHandler.isEmpty()) {
165 Warning() << "Left jobs running while shutting down ResourceAccess";
166 }
165} 167}
166 168
167QByteArray ResourceAccess::resourceName() const 169QByteArray ResourceAccess::resourceName() const