mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-10-09 03:20:48 +00:00
Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios
This commit is contained in:
commit
8c2171858f
@ -68,7 +68,7 @@ extension PeerInputActivity {
|
||||
self = .speakingInGroupCall(timestamp: timestamp)
|
||||
case .sendMessageChooseStickerAction:
|
||||
self = .choosingSticker
|
||||
case let .sendMessageHistoryImportAction:
|
||||
case .sendMessageHistoryImportAction:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
@ -577,7 +577,7 @@ tgcalls::VideoCaptureInterfaceObject *GetVideoCaptureAssumingSameThread(tgcalls:
|
||||
if (_keepLandscape) {
|
||||
resolvedId += std::string(":landscape");
|
||||
}
|
||||
_interface->switchToDevice(resolvedId);
|
||||
_interface->switchToDevice(resolvedId, false);
|
||||
}
|
||||
|
||||
- (void)setIsVideoEnabled:(bool)isVideoEnabled {
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit a9849273072b31182390a9f4f15777d510ce662a
|
||||
Subproject commit 6b986a40a333502288db5bcb9e1af7dfa042dcc9
|
Loading…
x
Reference in New Issue
Block a user