mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-02 15:35:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into profile

Browse Source 
Conflicts:
	Telegram/Telegram.vcxproj.filters
This commit is contained in:
John Preston
2016-05-16 18:45:50 +03:00
parent bf8a98a13b ecff1d15af
commit 6e2dea7030
66 changed files with 4666 additions and 2354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/dialogswidget.cpp
View File

@@ -1395,8 +1395,8 @@ void DialogsInner::selectSkipPage(int32 pixels, int32 direction) {
_sel = *i;
}
} else {
for (auto i = shownDialogs()->cfind(_sel), b = shownDialogs()->cbegin(); i != b && (toSkip--); --i) {
_sel = *i;
for (auto i = shownDialogs()->cfind(_sel), b = shownDialogs()->cbegin(); i != b && (toSkip--);) {
_sel = *(--i);
}
if (toSkip && importantDialogs) {
_importantSwitchSel = true;