mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 06:35:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

Browse Source
This commit is contained in:
John Preston
2014-11-12 23:30:32 +03:00
parent 379c5f75e7 a75f57beb8
commit 55649ad6c4
23 changed files with 874 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/mainwidget.cpp
View File

@@ -715,7 +715,7 @@ void MainWidget::itemReplaced(HistoryItem *oldItem, HistoryItem *newItem) {
}
void MainWidget::itemResized(HistoryItem *row) {
if (history.peer() == row->history()->peer && !row->detached()) {
if (!row || history.peer() == row->history()->peer && !row->detached()) {
history.itemResized(row);
}
if (overview) {
@@ -1118,7 +1118,7 @@ void MainWidget::peerAfter(const PeerData *inPeer, MsgId inMsg, PeerData *&outPe
}
PeerData *MainWidget::peer() {
return history.peer();
return overview ? overview->peer() : history.peer();
}
PeerData *MainWidget::activePeer() {