GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2026-01-14 06:23:57 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix note id mix-up when resolving notetype conflicts (#2940)

Browse source 
Closes #2939.
This commit is contained in:
RumovZ 2024-01-11 04:50:03 +01:00 committed by GitHub
parent eb45f8a76c
commit 4920c13526
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rslib/src/import_export/package/apkg/import/notes.rs
View file

@ -544,7 +544,7 @@ fn combine_template_ords_maps(old_map: &mut HashMap<u16, u16>, new: &Notetype) {
}
/// Target ids of notes with conflicting notetypes, with keys
/// `(target note's notetype, incoming note's notetypes)`.
/// `(target note's notetype, incoming note's notetype)`.
fn notetype_conflicts(
incoming_notes: &[Note],
existing_guids: &HashMap<String, NoteMeta>,
@ -556,7 +556,7 @@ fn notetype_conflicts(
conflicts
.entry((meta.notetype_id, note.notetype_id))
.or_default()
.push(note.id);
.push(meta.id);
}
};
}