diff options
| author | levlam <levlam@telegram.org> | 2022-08-03 21:38:03 +0300 |
|---|---|---|
| committer | levlam <levlam@telegram.org> | 2022-08-03 21:38:03 +0300 |
| commit | 33623f981852133c917b7b27a593bb55ddcebacf (patch) | |
| tree | f234c01390652c3233444d30e91e65552ea8ad03 /td/telegram/VoiceNotesManager.cpp | |
| parent | 36693a38721af6f519f32fe25f57ae439102c368 (diff) | |
Remove unused can_delete_old parameter.
Diffstat (limited to 'td/telegram/VoiceNotesManager.cpp')
| -rw-r--r-- | td/telegram/VoiceNotesManager.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/td/telegram/VoiceNotesManager.cpp b/td/telegram/VoiceNotesManager.cpp index f6fc8a232..b9bf8fce0 100644 --- a/td/telegram/VoiceNotesManager.cpp +++ b/td/telegram/VoiceNotesManager.cpp @@ -228,7 +228,7 @@ FileId VoiceNotesManager::dup_voice_note(FileId new_id, FileId old_id) { return new_id; } -void VoiceNotesManager::merge_voice_notes(FileId new_id, FileId old_id, bool can_delete_old) { +void VoiceNotesManager::merge_voice_notes(FileId new_id, FileId old_id) { CHECK(old_id.is_valid() && new_id.is_valid()); CHECK(new_id != old_id); @@ -238,13 +238,7 @@ void VoiceNotesManager::merge_voice_notes(FileId new_id, FileId old_id, bool can auto new_it = voice_notes_.find(new_id); if (new_it == voice_notes_.end()) { - auto &old = voice_notes_[old_id]; - if (!can_delete_old) { - dup_voice_note(new_id, old_id); - } else { - old->file_id = new_id; - voice_notes_.emplace(new_id, std::move(old)); - } + dup_voice_note(new_id, old_id); } else { VoiceNote *new_ = new_it->second.get(); CHECK(new_ != nullptr); @@ -254,9 +248,6 @@ void VoiceNotesManager::merge_voice_notes(FileId new_id, FileId old_id, bool can } } LOG_STATUS(td_->file_manager_->merge(new_id, old_id)); - if (can_delete_old) { - voice_notes_.erase(old_id); - } } void VoiceNotesManager::create_voice_note(FileId file_id, string mime_type, int32 duration, string waveform, |
