procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed crash in notifyShowNext(), not always enum pinned icons

This commit is contained in:
John Preston 2015-08-16 17:42:41 +03:00
parent d32e476d96
commit 8259314721
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Telegram/SourceFiles/pspecific_wnd.cpp
View File

@ -2219,7 +2219,9 @@ void RegisterCustomScheme() {
void psNewVersion() { void psNewVersion() {
RegisterCustomScheme(); RegisterCustomScheme();
CheckPinnedAppUserModelId(); if (Local::oldSettingsVersion() < 8050) {
CheckPinnedAppUserModelId();
}
} }
void psExecUpdater() { void psExecUpdater() {

11
Telegram/SourceFiles/settingswidget.cpp
View File

@ -1165,7 +1165,16 @@ void SettingsInner::onAskQuestionSure() {
} }
void SettingsInner::onTelegramFAQ() { void SettingsInner::onTelegramFAQ() {
QDesktopServices::openUrl(qsl("https://telegram.org/faq#general")); QString url = qsl("https://telegram.org/faq");
if (cLang() > languageDefault && cLang() < languageCount) {
const char *code = LanguageCodes[cLang()];
if (qstr("de") == code || qstr("es") == code || qstr("it") == code || qstr("ko") == code) {
url += qsl("/") + code;
} else if (qstr("pt_BR") == code) {
url += qsl("/br");
}
}
QDesktopServices::openUrl(url);
} }
void SettingsInner::chooseCustomLang() { void SettingsInner::chooseCustomLang() {

6
Telegram/SourceFiles/window.cpp
View File

@ -1467,8 +1467,8 @@ void Window::notifyShowNext(NotifyWindow *remove) {
uint64 ms = getms(true); uint64 ms = getms(true);
History *history = notifyItem->history(); History *history = notifyItem->history();
NotifyWhenMaps::iterator j = notifyWhenMaps.find(history); NotifyWhenMaps::iterator j = notifyWhenMaps.find(history);
bool notifyWhenFound = (j != notifyWhenMaps.cend());
if (j == notifyWhenMaps.end()) { if (!notifyWhenFound) {
history->clearNotifications(); history->clearNotifications();
} else { } else {
HistoryItem *nextNotify = 0; HistoryItem *nextNotify = 0;
@ -1516,7 +1516,7 @@ void Window::notifyShowNext(NotifyWindow *remove) {
if (!history->hasNotification()) { if (!history->hasNotification()) {
if (notifyWaiter != notifyWaiters.cend()) notifyWaiters.erase(notifyWaiter); if (notifyWaiter != notifyWaiters.cend()) notifyWaiters.erase(notifyWaiter);
if (j != notifyWhenMaps.cend()) notifyWhenMaps.erase(j); if (notifyWhenFound) notifyWhenMaps.erase(j);
continue; continue;
} }
} }