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
2015-01-28 16:14:49 +03:00
parent 61da0ff829 c428008166
commit 2c03490f2d
26 changed files with 218 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/settings.cpp
View File

@@ -37,6 +37,7 @@ bool gSoundNotify = true;
bool gDesktopNotify = true;
DBINotifyView gNotifyView = dbinvShowPreview;
bool gStartMinimized = false;
bool gStartInTray = false;
bool gAutoStart = false;
bool gSendToMenu = false;
bool gAutoUpdate = true;
@@ -151,6 +152,8 @@ void settingsParseArgs(int argc, char *argv[]) {
gNoStartUpdate = true;
} else if (string("-tosettings") == argv[i]) {
gStartToSettings = true;
} else if (string("-startintray") == argv[i]) {
gStartInTray = true;
} else if (string("-sendpath") == argv[i] && i + 1 < argc) {
for (++i; i < argc; ++i) {
gSendPaths.push_back(QString::fromLocal8Bit(argv[i]));
@@ -169,7 +172,7 @@ void settingsParseArgs(int argc, char *argv[]) {
const RecentEmojiPack &cGetRecentEmojis() {
if (cRecentEmojis().isEmpty()) {
RecentEmojiPack r;
if (false && !cRecentEmojisPreload().isEmpty()) {
if (!cRecentEmojisPreload().isEmpty()) {
RecentEmojiPreload p(cRecentEmojisPreload());
cSetRecentEmojisPreload(RecentEmojiPreload());
r.reserve(p.size());