diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contactsbox.cpp
index e9fdcfc65..da166de86 100644
--- a/Telegram/SourceFiles/boxes/contactsbox.cpp
+++ b/Telegram/SourceFiles/boxes/contactsbox.cpp
@@ -1095,7 +1095,7 @@ void ContactsInner::selectSkip(int32 dir) {
for (auto i = _contacts->cfind(_sel), end = _contacts->cend(); i != end && contactData(*i)->inchat; ++i) {
_sel = *i;
}
- if (contactData(_sel)->inchat) {
+ if (_sel && contactData(_sel)->inchat) {
_sel = nullptr;
}
if (!_sel) {
@@ -1114,11 +1114,13 @@ void ContactsInner::selectSkip(int32 dir) {
if (_byUsernameSel < 0) {
if (!_contacts->isEmpty()) {
if (!_newItemSel && !_sel) _sel = *(_contacts->cend() - 1);
- for (auto i = _contacts->cfind(_sel), b = _contacts->cbegin(); i != b && contactData(*i)->inchat; --i) {
- _sel = *i;
- }
- if (contactData(_sel)->inchat) {
- _sel = nullptr;
+ if (_sel) {
+ for (auto i = _contacts->cfind(_sel), b = _contacts->cbegin(); i != b && contactData(*i)->inchat; --i) {
+ _sel = *i;
+ }
+ if (contactData(_sel)->inchat) {
+ _sel = nullptr;
+ }
}
}
}
diff --git a/Telegram/SourceFiles/boxes/photosendbox.cpp b/Telegram/SourceFiles/boxes/photosendbox.cpp
index 4f91ea66f..7667d3471 100644
--- a/Telegram/SourceFiles/boxes/photosendbox.cpp
+++ b/Telegram/SourceFiles/boxes/photosendbox.cpp
@@ -648,7 +648,7 @@ void EditCaptionBox::onSave(bool ctrlShiftEnter) {
return;
}
- MTPmessages_EditMessage::Flags flags = 0;
+ MTPmessages_EditMessage::Flags flags = MTPmessages_EditMessage::Flag::f_message;
if (_previewCancelled) {
flags |= MTPmessages_EditMessage::Flag::f_no_webpage;
}
diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
index bcd4c5496..948dd8380 100644
--- a/Telegram/SourceFiles/config.h
+++ b/Telegram/SourceFiles/config.h
@@ -20,8 +20,8 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
*/
#pragma once
-static const int32 AppVersion = 9041;
-static const wchar_t *AppVersionStr = L"0.9.41";
+static const int32 AppVersion = 9042;
+static const wchar_t *AppVersionStr = L"0.9.42";
static const bool DevVersion = false;
//#define BETA_VERSION (9040128ULL) // just comment this line to build public version
diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index 4789cdf78..bebe9f51b 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -4713,7 +4713,7 @@ void HistoryWidget::saveEditMsg() {
return;
}
- MTPmessages_EditMessage::Flags sendFlags = 0;
+ MTPmessages_EditMessage::Flags sendFlags = MTPmessages_EditMessage::Flag::f_message;
if (webPageId == CancelledWebPageId) {
sendFlags |= MTPmessages_EditMessage::Flag::f_no_webpage;
}
diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
index 5258a6a05..ee78be63d 100644
--- a/Telegram/Telegram.plist
+++ b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 0.9.41
+ 0.9.42
CFBundleSignature
????
CFBundleURLTypes
diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
index f52493488..7602f2295 100644
--- a/Telegram/Telegram.rc
+++ b/Telegram/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1 ICON "Resources\\art\\icon256.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,41,0
- PRODUCTVERSION 0,9,41,0
+ FILEVERSION 0,9,42,0
+ PRODUCTVERSION 0,9,42,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "CompanyName", "Telegram Messenger LLP"
- VALUE "FileVersion", "0.9.41.0"
+ VALUE "FileVersion", "0.9.42.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop"
- VALUE "ProductVersion", "0.9.41.0"
+ VALUE "ProductVersion", "0.9.42.0"
END
END
BLOCK "VarFileInfo"
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index bb178869c..68dd8e923 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1898,7 +1898,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.41;
+ CURRENT_PROJECT_VERSION = 0.9.42;
DEBUG_INFORMATION_FORMAT = dwarf;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -1917,7 +1917,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
COPY_PHASE_STRIP = YES;
- CURRENT_PROJECT_VERSION = 0.9.41;
+ CURRENT_PROJECT_VERSION = 0.9.42;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_OPTIMIZATION_LEVEL = fast;
GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1946,10 +1946,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.41;
+ CURRENT_PROJECT_VERSION = 0.9.42;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 0.9;
- DYLIB_CURRENT_VERSION = 0.9.41;
+ DYLIB_CURRENT_VERSION = 0.9.42;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -2087,10 +2087,10 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "";
COPY_PHASE_STRIP = NO;
- CURRENT_PROJECT_VERSION = 0.9.41;
+ CURRENT_PROJECT_VERSION = 0.9.42;
DEBUG_INFORMATION_FORMAT = dwarf;
DYLIB_COMPATIBILITY_VERSION = 0.9;
- DYLIB_CURRENT_VERSION = 0.9.41;
+ DYLIB_CURRENT_VERSION = 0.9.42;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = "";
diff --git a/Telegram/Version b/Telegram/Version
index 95a95cf2f..195ddfb69 100644
--- a/Telegram/Version
+++ b/Telegram/Version
@@ -1,6 +1,6 @@
-AppVersion 9041
+AppVersion 9042
AppVersionStrMajor 0.9
-AppVersionStrSmall 0.9.41
-AppVersionStr 0.9.41
+AppVersionStrSmall 0.9.42
+AppVersionStr 0.9.42
DevChannel 0
BetaVersion 0