mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-05 09:33:25 -08:00
Fix remaining review threads on the conflict classification
- Remove the duplicated download loop and the stray '<' plus extra brace that left the head unbuildable. - Skip the fallback upload under DownloadMode so a local-only deck is not pushed when the user asked for downloads only. - Treat a server row without a hash as unknown rather than changed, so pre-migration decks are not re-downloaded on every sync.
This commit is contained in:
parent
cc68893d23
commit
ae4d40e1eb
2 changed files with 9 additions and 7 deletions
|
|
@ -170,7 +170,7 @@ private:
|
|||
void sendDelete(const QString &relativePath, int deckId);
|
||||
void snapshotLocalFile(const QString &relativePath, const QString &guid);
|
||||
QString readBaseSnapshot(const QString &guid) const;
|
||||
void classify(const QMap<QString, ServerFile> &serverFiles);
|
||||
void classify(const QMap<int, ServerFile> &serverFiles);
|
||||
void queueConflict(const QString &relativePath,
|
||||
const QString &serverPath,
|
||||
int deckId,
|
||||
|
|
@ -208,7 +208,7 @@ private:
|
|||
QList<QString> pendingDeletes;
|
||||
QSet<QString> conflictPaths;
|
||||
QMap<QString, ConflictDownload> pendingConflicts;
|
||||
QMap<QString, ServerFile> stashedServerFiles;
|
||||
QMap<int, ServerFile> stashedServerFiles;
|
||||
ActiveConflict activeConflict;
|
||||
DeckSyncMode syncMode = DeckSyncMode::TwoWay;
|
||||
int conflictDefault = DeckSyncConflictAsk;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue