diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index eb65a9e658..42dfb4ca5b 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,18,0 - PRODUCTVERSION 0,10,18,0 + FILEVERSION 0,10,19,0 + PRODUCTVERSION 0,10,19,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -51,10 +51,10 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Telegram Messenger LLP" - VALUE "FileVersion", "0.10.18.0" + VALUE "FileVersion", "0.10.19.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.18.0" + VALUE "ProductVersion", "0.10.19.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index a4144454b0..94d2a067f5 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,10,18,0 - PRODUCTVERSION 0,10,18,0 + FILEVERSION 0,10,19,0 + PRODUCTVERSION 0,10,19,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -43,10 +43,10 @@ BEGIN BEGIN VALUE "CompanyName", "Telegram Messenger LLP" VALUE "FileDescription", "Telegram Updater" - VALUE "FileVersion", "0.10.18.0" + VALUE "FileVersion", "0.10.19.0" VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "ProductName", "Telegram Desktop" - VALUE "ProductVersion", "0.10.18.0" + VALUE "ProductVersion", "0.10.19.0" END END BLOCK "VarFileInfo" diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h index 5c050ece0b..7fc1fbaaf1 100644 --- a/Telegram/SourceFiles/core/version.h +++ b/Telegram/SourceFiles/core/version.h @@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #define BETA_VERSION_MACRO (0ULL) -constexpr int AppVersion = 10018; -constexpr str_const AppVersionStr = "0.10.18"; +constexpr int AppVersion = 10019; +constexpr str_const AppVersionStr = "0.10.19"; constexpr bool AppAlphaVersion = false; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; diff --git a/Telegram/SourceFiles/mtproto/session.cpp b/Telegram/SourceFiles/mtproto/session.cpp index 54cb07a9eb..b9e7453e21 100644 --- a/Telegram/SourceFiles/mtproto/session.cpp +++ b/Telegram/SourceFiles/mtproto/session.cpp @@ -213,7 +213,7 @@ void Session::needToResumeAndSend() { return; } createDcData(); - start(); + _connection->start(); } if (_ping) { _ping = false; diff --git a/Telegram/build/build.bat b/Telegram/build/build.bat index 249d22b76a..c9e3ef2376 100644 --- a/Telegram/build/build.bat +++ b/Telegram/build/build.bat @@ -92,7 +92,7 @@ echo Version %AppVersionStrFull% build successfull. Preparing.. echo . echo Dumping debug symbols.. -xcopy "%ReleasePath%\%BinaryName%.exe" "%ReleasePath%\%BinaryName%.exe.exe" +xcopy "%ReleasePath%\%BinaryName%.exe" "%ReleasePath%\%BinaryName%.exe.exe*" call "%SolutionPath%\..\Libraries\breakpad\src\tools\windows\dump_syms\Release\dump_syms.exe" "%ReleasePath%\%BinaryName%.exe.pdb" > "%ReleasePath%\%BinaryName%.exe.sym" del "%ReleasePath%\%BinaryName%.exe.exe" echo Done! diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh index ae24b236df..64ce246957 100755 --- a/Telegram/build/build.sh +++ b/Telegram/build/build.sh @@ -124,7 +124,7 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then fi gyp/refresh.sh - + cd $ReleasePath make -j4 echo "$BinaryName build complete!" @@ -278,18 +278,13 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then if [ "$BetaVersion" == "0" ]; then cd "$ReleasePath" - cp -f tsetup_blank.dmg tsetup.temp.dmg + cp -f tsetup_template.dmg tsetup.temp.dmg TempDiskPath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.temp.dmg | awk -F "\t" 'END {print $3}'` cp -R "./$BinaryName.app" "$TempDiskPath/" bless --folder "$TempDiskPath/" --openfolder "$TempDiskPath/" - hdiutil create tsetup.dmg -srcfolder "$TempDiskPath/" -volname "Telegram Desktop" -format UDRW -ov - FinalDiskPath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'` - cp -R "$TempDiskPath/.DS_Store" "$FinalDiskPath/.DS_Store" hdiutil detach "$TempDiskPath" - hdiutil detach "$FinalDiskPath" - hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o "$SetupFile" + hdiutil convert tsetup.temp.dmg -format UDZO -imagekey zlib-level=9 -ov -o "$SetupFile" rm tsetup.temp.dmg - rm tsetup.dmg fi cd "$ReleasePath" "./Packer" -path "$BinaryName.app" -target "$BuildTarget" -version $VersionForPacker $AlphaBetaParam diff --git a/Telegram/build/version b/Telegram/build/version index b42ecf8aa1..37d79d925c 100644 --- a/Telegram/build/version +++ b/Telegram/build/version @@ -1,6 +1,6 @@ -AppVersion 10018 +AppVersion 10019 AppVersionStrMajor 0.10 -AppVersionStrSmall 0.10.18 -AppVersionStr 0.10.18 +AppVersionStrSmall 0.10.19 +AppVersionStr 0.10.19 AlphaChannel 0 BetaVersion 0