mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-28 03:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity

SyncEngine: Avoid transaction warning

Browse source
This commit is contained in:
Markus Goetz 2014-10-20 17:20:58 +02:00
parent 04b62b139d
commit 2de22b408b
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mirall/syncengine.cpp
View file

@ -618,7 +618,7 @@ void SyncEngine::slotDiscoveryJobFinished(int discoveryResult)
return;
} else {
// Commits a possibly existing (should not though) transaction and starts a new one for the propagate phase
_journal->commit("pre Propagate");
_journal->commitIfNeededAndStartNewTransaction("Post discovery");
}
if( csync_reconcile(_csync_ctx) < 0 ) {

10
src/mirall/syncjournaldb.cpp
View file

@ -1046,6 +1046,16 @@ void SyncJournalDb::commit(const QString& context, bool startTrans)
commitInternal(context, startTrans);
}
void SyncJournalDb::commitIfNeededAndStartNewTransaction(const QString &context)
{
QMutexLocker lock(&_mutex);
if( _transaction == 1 ) {
commitInternal(context, true);
} else {
startTransaction();
}
}
void SyncJournalDb::commitInternal(const QString& context, bool startTrans )
{

1
src/mirall/syncjournaldb.h
View file

@ -93,6 +93,7 @@ public:
* Commit will actually commit the transaction and create a new one.
*/
void commit(const QString &context, bool startTrans = true);
void commitIfNeededAndStartNewTransaction(const QString &context);
void close();