Fix AutoConnection::debugState() for TCP connections. Fix #3171

Also silent new Xcode version warning.
This commit is contained in:
John Preston 2017-03-30 18:20:51 +03:00
parent a851497bbf
commit f0ab72ffbc
2 changed files with 2 additions and 2 deletions

View File

@ -307,7 +307,7 @@ bool AutoConnection::needHttpWait() {
}
int32 AutoConnection::debugState() const {
return (status == UsingHttp) ? -1 : (UsingTcp ? sock.state() : -777);
return (status == UsingHttp) ? -1 : ((status == UsingTcp) ? sock.state() : -777);
}
QString AutoConnection::transport() const {

View File

@ -20,7 +20,7 @@ else
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode-ninja
#gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp --format=xcode
# use patched gyp with Xcode project generator
../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp -Gxcode_upgrade_check_project_version=820 --format=xcode
../../../Libraries/gyp/gyp --depth=. --generator-output=../.. -Goutput_dir=out Telegram.gyp -Gxcode_upgrade_check_project_version=830 --format=xcode
fi
cd ../..