Skip to content

Commit 2f0dd0c

Browse files
committed
Merge branch 'hotfix/0.2.6'
2 parents a9f699b + 5600760 commit 2f0dd0c

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

Adamant/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.2.5</string>
20+
<string>0.2.6</string>
2121
<key>CFBundleVersion</key>
22-
<string>12</string>
22+
<string>13</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>NSCameraUsageDescription</key>

Adamant/Stories/Chats/NewChatViewController.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,13 @@ class NewChatViewController: FormViewController {
165165
case .notDetermined:
166166
AVCaptureDevice.requestAccess(for: .video) { [weak self] (granted: Bool) in
167167
if granted, let qrReader = self?.qrReader {
168-
self?.present(qrReader, animated: true, completion: nil)
168+
if Thread.isMainThread {
169+
self?.present(qrReader, animated: true, completion: nil)
170+
} else {
171+
DispatchQueue.main.async {
172+
self?.present(qrReader, animated: true, completion: nil)
173+
}
174+
}
169175
} else {
170176
return
171177
}

Adamant/Stories/Login/LoginViewController.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,13 @@ extension LoginViewController {
272272
case .notDetermined:
273273
AVCaptureDevice.requestAccess(for: .video) { [weak self] (granted: Bool) in
274274
if granted, let qrReader = self?.qrReader {
275-
self?.present(qrReader, animated: true, completion: nil)
275+
if Thread.isMainThread {
276+
self?.present(qrReader, animated: true, completion: nil)
277+
} else {
278+
DispatchQueue.main.async {
279+
self?.present(qrReader, animated: true, completion: nil)
280+
}
281+
}
276282
} else {
277283
return
278284
}

0 commit comments

Comments
 (0)