Version 0.10.19: Critical bug fix of Session::needToResumeAndSend().

This commit is contained in:
John Preston 2016-10-24 23:37:43 +03:00
parent 1cfe9d0ff5
commit 802349d042
7 changed files with 18 additions and 23 deletions

View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,18,0 FILEVERSION 0,10,19,0
PRODUCTVERSION 0,10,18,0 PRODUCTVERSION 0,10,19,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.10.18.0" VALUE "FileVersion", "0.10.19.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.18.0" VALUE "ProductVersion", "0.10.19.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,18,0 FILEVERSION 0,10,19,0
PRODUCTVERSION 0,10,18,0 PRODUCTVERSION 0,10,19,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater" VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.10.18.0" VALUE "FileVersion", "0.10.19.0"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.18.0" VALUE "ProductVersion", "0.10.19.0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

View File

@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#define BETA_VERSION_MACRO (0ULL) #define BETA_VERSION_MACRO (0ULL)
constexpr int AppVersion = 10018; constexpr int AppVersion = 10019;
constexpr str_const AppVersionStr = "0.10.18"; constexpr str_const AppVersionStr = "0.10.19";
constexpr bool AppAlphaVersion = false; constexpr bool AppAlphaVersion = false;
constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO; constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;

View File

@ -213,7 +213,7 @@ void Session::needToResumeAndSend() {
return; return;
} }
createDcData(); createDcData();
start(); _connection->start();
} }
if (_ping) { if (_ping) {
_ping = false; _ping = false;

View File

@ -92,7 +92,7 @@ echo Version %AppVersionStrFull% build successfull. Preparing..
echo . echo .
echo Dumping debug symbols.. 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" 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" del "%ReleasePath%\%BinaryName%.exe.exe"
echo Done! echo Done!

View File

@ -124,7 +124,7 @@ if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
fi fi
gyp/refresh.sh gyp/refresh.sh
cd $ReleasePath cd $ReleasePath
make -j4 make -j4
echo "$BinaryName build complete!" echo "$BinaryName build complete!"
@ -278,18 +278,13 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
if [ "$BetaVersion" == "0" ]; then if [ "$BetaVersion" == "0" ]; then
cd "$ReleasePath" 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}'` TempDiskPath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.temp.dmg | awk -F "\t" 'END {print $3}'`
cp -R "./$BinaryName.app" "$TempDiskPath/" cp -R "./$BinaryName.app" "$TempDiskPath/"
bless --folder "$TempDiskPath/" --openfolder "$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 "$TempDiskPath"
hdiutil detach "$FinalDiskPath" hdiutil convert tsetup.temp.dmg -format UDZO -imagekey zlib-level=9 -ov -o "$SetupFile"
hdiutil convert tsetup.dmg -format UDZO -imagekey zlib-level=9 -ov -o "$SetupFile"
rm tsetup.temp.dmg rm tsetup.temp.dmg
rm tsetup.dmg
fi fi
cd "$ReleasePath" cd "$ReleasePath"
"./Packer" -path "$BinaryName.app" -target "$BuildTarget" -version $VersionForPacker $AlphaBetaParam "./Packer" -path "$BinaryName.app" -target "$BuildTarget" -version $VersionForPacker $AlphaBetaParam

View File

@ -1,6 +1,6 @@
AppVersion 10018 AppVersion 10019
AppVersionStrMajor 0.10 AppVersionStrMajor 0.10
AppVersionStrSmall 0.10.18 AppVersionStrSmall 0.10.19
AppVersionStr 0.10.18 AppVersionStr 0.10.19
AlphaChannel 0 AlphaChannel 0
BetaVersion 0 BetaVersion 0