2
0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00

Merge branch 'game_media' into player

Conflicts:
	Telegram/SourceFiles/application.cpp
	Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
	Telegram/SourceFiles/mainwidget.cpp
	Telegram/SourceFiles/mainwidget.h
	Telegram/SourceFiles/structs.h
This commit is contained in:
John Preston
2016-09-29 00:31:43 +03:00
63 changed files with 11739 additions and 9283 deletions

View File

@@ -2978,11 +2978,11 @@ public:
voice->waveform[0] = -2;
voice->wavemax = 0;
}
const DocumentItems &items(App::documentItems());
DocumentItems::const_iterator i = items.constFind(_doc);
auto &items = App::documentItems();
auto i = items.constFind(_doc);
if (i != items.cend()) {
for (HistoryItemsMap::const_iterator j = i->cbegin(), e = i->cend(); j != e; ++j) {
Ui::repaintHistoryItem(j.key());
for_const (auto item, i.value()) {
Ui::repaintHistoryItem(item);
}
}
}