diff options
author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2011-11-18 13:22:59 +0000 |
---|---|---|
committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2011-11-25 16:43:30 +0000 |
commit | c937a3c395441eb1da825fe15894e316c90e2464 (patch) | |
tree | 55d1178e3c98897ca8acfb0463eace568412daba /plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp | |
parent | 4edb12f7de657c237072fc337f9ad0e5dc6529ea (diff) |
Trap leaves in non-leaving functions
Reviewed-by: TrustMe
Diffstat (limited to 'plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp')
-rw-r--r-- | plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp index a443d96de5..bb7c1d73c9 100644 --- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp +++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp @@ -328,13 +328,14 @@ void S60AudioCaptureSession::record() return; if (m_captureState == EInitialized || m_captureState == ERecordComplete) { - prepareSinkL(); - QString filename = m_sink.toString(); - TPtrC16 sink(reinterpret_cast<const TUint16*>(filename.utf16())); - TUid controllerUid(TUid::Uid(m_controllerIdMap.value(m_container).controllerUid)); - TUid formatUid(TUid::Uid(m_controllerIdMap.value(m_container).destinationFormatUid)); - - TRAPD(err,m_recorderUtility->OpenFileL(sink)); + TRAPD(err, prepareSinkL()); + if (!err) { + QString filename = m_sink.toString(); + TPtrC16 sink(reinterpret_cast<const TUint16*>(filename.utf16())); + TUid controllerUid(TUid::Uid(m_controllerIdMap.value(m_container).controllerUid)); + TUid formatUid(TUid::Uid(m_controllerIdMap.value(m_container).destinationFormatUid)); + TRAP(err, m_recorderUtility->OpenFileL(sink)); + } setError(err); }else if (m_captureState == EPaused) { m_recorderUtility->SetPosition(m_pausedPosition); |