diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-03-19 10:41:46 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-19 10:56:30 +0100 |
| commit | 73de758274f874ad92cd891717a58807a288b4d4 (patch) | |
| tree | 07125d7d37293e5acdf9a467a0a0ce091588b4f1 /src | |
| parent | 4c0e4e15362c65d52b7f0e8f7a9e9576b45010e8 (diff) | |
Prevent crash when there is no camera device available
If you try to use QAudioInputSelectorControl with the iOS Simulator then
it would crash as there is no camera device available. This prevents a
crash from happening in that case.
Change-Id: I3904f3d299a11a6df21e66a1138a4319cc0b8a5c
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm b/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm index 6c6df5164..4a2f068f5 100644 --- a/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm +++ b/src/plugins/avfoundation/camera/avfaudioinputselectorcontrol.mm @@ -60,7 +60,8 @@ AVFAudioInputSelectorControl::AVFAudioInputSelectorControl(AVFCameraService *ser QString::fromUtf8([[device localizedName] UTF8String])); } - m_activeInput = m_devices.first(); + if (m_devices.size() > 0) + m_activeInput = m_devices.first(); } AVFAudioInputSelectorControl::~AVFAudioInputSelectorControl() @@ -79,7 +80,7 @@ QString AVFAudioInputSelectorControl::inputDescription(const QString &name) cons QString AVFAudioInputSelectorControl::defaultInput() const { - return m_devices.first(); + return m_devices.size() > 0 ? m_devices.first() : QString(); } QString AVFAudioInputSelectorControl::activeInput() const |