fixed crash on contacts without names

telegramdesktop · Dec 13, 2014 · 2a50004 · 2a50004
1 parent 20e04d4
commit 2a50004
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 19 deletions.
diff --git a/Telegram/PrepareWin.bat b/Telegram/PrepareWin.bat
@@ -1,8 +1,8 @@
 @echo OFF
 
-set "AppVersionStrSmall=0.6.20"
-set "AppVersionStr=0.6.20"
-set "AppVersionStrFull=0.6.20.0"
+set "AppVersionStrSmall=0.6.21"
+set "AppVersionStr=0.6.21"
+set "AppVersionStrFull=0.6.21.0"
 
 echo.
 echo Preparing version %AppVersionStr%..

diff --git a/Telegram/SourceFiles/config.h b/Telegram/SourceFiles/config.h
@@ -17,16 +17,16 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-static const int32 AppVersion = 6020;
-static const wchar_t *AppVersionStr = L"0.6.20";
+static const int32 AppVersion = 6021;
+static const wchar_t *AppVersionStr = L"0.6.21";
 
 static const wchar_t *AppNameOld = L"Telegram Win (Unofficial)";
 static const wchar_t *AppName = L"Telegram Desktop";
 
 static const wchar_t *AppId = L"{53F49750-6209-4FBF-9CA8-7A333C87D1ED}"; // used in updater.cpp and Setup.iss for Windows
 static const wchar_t *AppFile = L"Telegram";
 
-static const int32 FeaturesNotifyVersion = 6020;
+static const int32 FeaturesNotifyVersion = 6021;
 static const int32 FeaturesNotifyVersionFrom = 6017;
 extern const char *FeaturesNotify;
 
@@ -160,7 +160,9 @@ static const BuiltInDc _builtInDcs[] = {
 };
 
 static const BuiltInDc _builtInTestDcs[] = {
-	{ 1, "173.240.5.253", 443 }
+	{ 1, "173.240.5.253", 443 },
+	{ 2, "149.154.167.40", 443 },
+	{ 3, "174.140.142.5", 443 }
 };
 
 inline const BuiltInDc *builtInDcs() {

diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
@@ -298,7 +298,7 @@ const ChatData *PeerData::asChat() const {
 }
 
 void PeerData::updateName(const QString &newName, const QString &newNameOrPhone, const QString &newUsername) {
-	if (name == newName && nameOrPhone == newNameOrPhone && (chat || asUser()->username == newUsername)) return;
+	if (name == newName && nameOrPhone == newNameOrPhone && (chat || asUser()->username == newUsername) && nameVersion > 0) return;
 
 	++nameVersion;
 	name = newName;

diff --git a/Telegram/SourceFiles/main.cpp b/Telegram/SourceFiles/main.cpp
@@ -20,7 +20,7 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 #include "pspecific.h"
 
 const char *FeaturesNotify = "\
-Telegram Desktop was updated to version 0.6.20\n\
+Telegram Desktop was updated to version 0.6.21\n\
 \n\
  \xe2\x80\x94 Single column layout for smaller window sizes.\n\
  \xe2\x80\x94 Photos are sent up to 1280x1280 size.\n\

diff --git a/Telegram/SourceFiles/pspecific_wnd.cpp b/Telegram/SourceFiles/pspecific_wnd.cpp
@@ -1047,8 +1047,8 @@ void PsMainWindow::psInitSize() {
 
 	TWindowPos pos(cWindowPos());
 	if (cDebug()) { // temp while design
-		pos.w = 800;
-		pos.h = 600;
+		pos.w = st::wndDefWidth;
+		pos.h = st::wndDefHeight;
 	}
 	QRect avail(QDesktopWidget().availableGeometry());
 	bool maximized = false;

diff --git a/Telegram/Telegram.plist b/Telegram/Telegram.plist
@@ -11,7 +11,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.20</string>
+	<string>0.6.21</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

diff --git a/Telegram/Telegram.rc b/Telegram/Telegram.rc
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -1577,7 +1577,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.6.20;
+				CURRENT_PROJECT_VERSION = 0.6.21;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -1595,7 +1595,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 0.6.20;
+				CURRENT_PROJECT_VERSION = 0.6.21;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				GCC_PREFIX_HEADER = ./SourceFiles/stdafx.h;
@@ -1621,10 +1621,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.6.20;
+				CURRENT_PROJECT_VERSION = 0.6.21;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.6;
-				DYLIB_CURRENT_VERSION = 0.6.20;
+				DYLIB_CURRENT_VERSION = 0.6.21;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -1764,10 +1764,10 @@
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 0.6.20;
+				CURRENT_PROJECT_VERSION = 0.6.21;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DYLIB_COMPATIBILITY_VERSION = 0.6;
-				DYLIB_CURRENT_VERSION = 0.6.20;
+				DYLIB_CURRENT_VERSION = 0.6.21;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;

diff --git a/Telegram/Version.sh b/Telegram/Version.sh
@@ -1,2 +1,2 @@
-echo 6020 0.6.20
+echo 6021 0.6.21