diff options
| author | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2016-09-17 17:59:12 +0900 |
|---|---|---|
| committer | Kitsune Ral <Kitsune-Ral@users.sf.net> | 2016-09-17 17:59:12 +0900 |
| commit | 9ad7029587829aee5c4c21768b7b4831096f1593 (patch) | |
| tree | 4a231464a3d32d0ccd97d757fe25065e487d1eac /connection.cpp | |
| parent | fab0bb1993b570e01333cfe4d8dc70e2a7bf87b7 (diff) | |
| parent | ac5ae85ed43d1f92cfc99bf1ea687d33f56ccd13 (diff) | |
| download | libquotient-9ad7029587829aee5c4c21768b7b4831096f1593.tar.gz libquotient-9ad7029587829aee5c4c21768b7b4831096f1593.zip | |
Merge remote-tracking branch 'remotes/origin/master' into fix-messages-ordering
Diffstat (limited to 'connection.cpp')
| -rw-r--r-- | connection.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/connection.cpp b/connection.cpp index aebe7631..9f56ec96 100644 --- a/connection.cpp +++ b/connection.cpp @@ -163,10 +163,10 @@ void Connection::logout() job->start(); } -SyncJob* Connection::sync(int timeout) +void Connection::sync(int timeout) { if (d->syncJob) - return d->syncJob; + return; const QString filter = "{\"room\": { \"timeline\": { \"limit\": 100 } } }"; auto job = d->startSyncJob(filter, timeout); @@ -187,7 +187,6 @@ SyncJob* Connection::sync(int timeout) else emit connectionError(job->errorString()); }); - return job; } SyncJob* Connection::Private::startSyncJob(const QString& filter, int timeout) |