ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-07 17:30:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge fix

Browse Source
This commit is contained in:
overtake 2019-06-11 19:03:58 +02:00
parent 76afb7aeea
commit a2786a1401
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TelegramUI/ChatController.swift
View File

@ -83,7 +83,7 @@ private func isTopmostChatController(_ controller: ChatController) -> Bool {
let ChatControllerCount = Atomic<Int32>(value: 0) let ChatControllerCount = Atomic<Int32>(value: 0)
public final class ChatController: TelegramController, KeyShortcutResponder, GalleryHiddenMediaTarget, UIDropInteractionDelegate { public final class ChatController: TelegramController, GalleryHiddenMediaTarget, UIDropInteractionDelegate {
private var validLayout: ContainerViewLayout? private var validLayout: ContainerViewLayout?
weak var parentController: ViewController? weak var parentController: ViewController?
@ -6613,7 +6613,7 @@ public final class ChatController: TelegramController, KeyShortcutResponder, Gal
} }
} }
public var keyShortcuts: [KeyShortcut] { public override var keyShortcuts: [KeyShortcut] {
let strings = self.presentationData.strings let strings = self.presentationData.strings
var inputShortcuts: [KeyShortcut] var inputShortcuts: [KeyShortcut]