hiro/tdesktop
1
0
Fork 0
mirror of https://github.com/vale981/tdesktop synced 2025-03-06 18:21:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/telegramdesktop/tdesktop

Browse source
This commit is contained in:
John Preston 2016-09-23 19:42:03 +03:00
commit 3e4088b413
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/pspecific_mac_p.mm
View file

@ -1143,11 +1143,11 @@ void objc_downloadPathEnableAccess(const QByteArray &bookmark) {
} }
_downloadPathUrl = url; _downloadPathUrl = url;
cSetDownloadPath(objcString([_downloadPathUrl path]) + '/'); Global::SetDownloadPath(objcString([_downloadPathUrl path]) + '/');
if (isStale) { if (isStale) {
NSData *data = [_downloadPathUrl bookmarkDataWithOptions:NSURLBookmarkCreationWithSecurityScope includingResourceValuesForKeys:nil relativeToURL:nil error:&error]; NSData *data = [_downloadPathUrl bookmarkDataWithOptions:NSURLBookmarkCreationWithSecurityScope includingResourceValuesForKeys:nil relativeToURL:nil error:&error];
if (data) { if (data) {
cSetDownloadPathBookmark(QByteArray::fromNSData(data)); Global::SetDownloadPathBookmark(QByteArray::fromNSData(data));
Local::writeUserSettings(); Local::writeUserSettings();
} }
} }

2
Telegram/build/build.sh
View file

@ -357,7 +357,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
rm -rf "$ReleasePath/$BinaryName.app/Contents/_CodeSignature" rm -rf "$ReleasePath/$BinaryName.app/Contents/_CodeSignature"
mkdir -p "$DropboxDeployPath" mkdir -p "$DropboxDeployPath"
cp -v "$DeployPath/$BinaryName.app" "$DropboxDeployPath/" cp -rv "$DeployPath/$BinaryName.app" "$DropboxDeployPath/"
cp -rv "$DeployPath/$BinaryName.app.dSYM" "$DropboxDeployPath/" cp -rv "$DeployPath/$BinaryName.app.dSYM" "$DropboxDeployPath/"
fi fi
fi fi