Trap leaves in non-leaving functions

Reviewed-by: TrustMe

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);