mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-28 07:54:49 +03:00
SyncEngine: Fix accidental re-discovery because of broken version table
Bug had been triggered by d63abef718
Broken version table in there since some time it seems like.
This commit is contained in:
parent
9b34427a1c
commit
07ffff3d77
1 changed files with 3 additions and 2 deletions
|
@ -30,7 +30,7 @@
|
||||||
namespace OCC {
|
namespace OCC {
|
||||||
|
|
||||||
SyncJournalDb::SyncJournalDb(const QString& path, QObject *parent) :
|
SyncJournalDb::SyncJournalDb(const QString& path, QObject *parent) :
|
||||||
QObject(parent), _transaction(0), _possibleUpgradeFromMirall_1_5(false)
|
QObject(parent), _transaction(0), _possibleUpgradeFromMirall_1_5(false), _possibleUpgradeFromMirall_1_8_0(false)
|
||||||
{
|
{
|
||||||
|
|
||||||
_dbFile = path;
|
_dbFile = path;
|
||||||
|
@ -286,7 +286,7 @@ bool SyncJournalDb::checkConnect()
|
||||||
createQuery.bindValue(1, MIRALL_VERSION_MAJOR);
|
createQuery.bindValue(1, MIRALL_VERSION_MAJOR);
|
||||||
createQuery.bindValue(2, MIRALL_VERSION_MINOR);
|
createQuery.bindValue(2, MIRALL_VERSION_MINOR);
|
||||||
createQuery.bindValue(3, MIRALL_VERSION_PATCH);
|
createQuery.bindValue(3, MIRALL_VERSION_PATCH);
|
||||||
createQuery.bindValue(3, MIRALL_VERSION_BUILD);
|
createQuery.bindValue(4, MIRALL_VERSION_BUILD);
|
||||||
createQuery.exec();
|
createQuery.exec();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
@ -295,6 +295,7 @@ bool SyncJournalDb::checkConnect()
|
||||||
int patch = versionQuery.intValue(2);
|
int patch = versionQuery.intValue(2);
|
||||||
|
|
||||||
if( major == 1 && minor == 8 && patch == 0 ) {
|
if( major == 1 && minor == 8 && patch == 0 ) {
|
||||||
|
qDebug() << Q_FUNC_INFO << "_possibleUpgradeFromMirall_1_8_0 detected!";
|
||||||
_possibleUpgradeFromMirall_1_8_0 = true;
|
_possibleUpgradeFromMirall_1_8_0 = true;
|
||||||
}
|
}
|
||||||
// Not comparing the BUILD id here, correct?
|
// Not comparing the BUILD id here, correct?
|
||||||
|
|
Loading…
Reference in a new issue