diff --git a/lib/views/widgets/qr/asset_scan_qr.dart b/lib/views/widgets/qr/asset_scan_qr.dart index 50072857..a81e7c4a 100644 --- a/lib/views/widgets/qr/asset_scan_qr.dart +++ b/lib/views/widgets/qr/asset_scan_qr.dart @@ -49,7 +49,8 @@ class _AssetScanQrState extends State { } _pickManually() async { - await Navigator.push(context, MaterialPageRoute(builder: (context) => const SearchAssetPage())); + _controller?.pauseCamera(); + await Navigator.push(context, MaterialPageRoute(builder: (context) => const SearchAssetPage())).then((value) => _controller?.resumeCamera()); } _getDevice(String result, {bool isQr = false}) async { @@ -79,7 +80,9 @@ class _AssetScanQrState extends State { if (!_scanDone) { _scanDone = true; final result = await _getDevice(scanData.code, isQr: true); - Navigator.of(context).pop(result[0]); + if(result.isNotEmpty) { + Navigator.of(context).pop(result[0]); + } } }); },