From 136e0fa3709f3f973343db26a090c9e9c907108d Mon Sep 17 00:00:00 2001 From: Mikhail Filimonov Date: Fri, 28 Jun 2024 13:38:44 -0300 Subject: [PATCH] macos related changes --- submodules/MediaPlayer/Package.swift | 8 ++++---- submodules/TelegramCore/Sources/Network/Network.swift | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/submodules/MediaPlayer/Package.swift b/submodules/MediaPlayer/Package.swift index 35d1875d35..a35bec3fb0 100644 --- a/submodules/MediaPlayer/Package.swift +++ b/submodules/MediaPlayer/Package.swift @@ -4,13 +4,13 @@ import PackageDescription let package = Package( - name: "MediaPlayer", + name: "TelegramMediaPlayer", platforms: [.macOS(.v10_13)], products: [ // Products define the executables and libraries a package produces, and make them visible to other packages. .library( - name: "MediaPlayer", - targets: ["MediaPlayer"]), + name: "TelegramMediaPlayer", + targets: ["TelegramMediaPlayer"]), ], dependencies: [ .package(name: "TelegramCore", path: "../TelegramCore"), @@ -27,7 +27,7 @@ let package = Package( // Targets are the basic building blocks of a package. A target can define a module or a test suite. // Targets can depend on other targets in this package, and on products in packages this package depends on. .target( - name: "MediaPlayer", + name: "TelegramMediaPlayer", dependencies: [.product(name: "TelegramCore", package: "TelegramCore", condition: nil), .product(name: "Postbox", package: "Postbox", condition: nil), .product(name: "FFMpegBinding", package: "FFMpegBinding", condition: nil), diff --git a/submodules/TelegramCore/Sources/Network/Network.swift b/submodules/TelegramCore/Sources/Network/Network.swift index 3811abccb7..5821411918 100644 --- a/submodules/TelegramCore/Sources/Network/Network.swift +++ b/submodules/TelegramCore/Sources/Network/Network.swift @@ -929,7 +929,11 @@ public final class Network: NSObject, MTRequestMessageServiceDelegate { datacenterId = id isCdn = true } - return strongSelf.makeWorker(datacenterId: datacenterId, isCdn: isCdn, isMedia: isMedia, tag: tag, continueInBackground: continueInBackground) + if datacenterId != 0 { + return strongSelf.makeWorker(datacenterId: datacenterId, isCdn: isCdn, isMedia: isMedia, tag: tag, continueInBackground: continueInBackground) + } else { + return nil + } } return nil })