prevent issues fixed

Change-Id: Ia34584c6a0e71c02dfab77294e802b3bc327f096

diff --git a/src/VpSoundPathPopup.cpp b/src/VpSoundPathPopup.cpp
index 3fa0ba8..3fad17c 100644 (file)
--- a/src/VpSoundPathPopup.cpp
+++ b/src/VpSoundPathPopup.cpp
@@ -230,16 +230,23 @@ void
 SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
 {
        result r = E_FAILURE;
-       Frame* pFrame = null;
-       VideoPlayerForm* mainForm = null;
 
        AudioRouteInfo currentAudioRoute(INPUT_AUDIO_DEVICE_NONE, OUTPUT_AUDIO_DEVICE_NONE);
        AudioRouteInfo audioRouteSpeaker(INPUT_AUDIO_DEVICE_NONE, OUTPUT_AUDIO_DEVICE_SPEAKER);
        AudioRouteInfo audioRouteWiredAccessory(INPUT_AUDIO_DEVICE_NONE, OUTPUT_AUDIO_DEVICE_WIRED_ACCESSORY);
        AudioRouteInfo audioRouteBluetooth(INPUT_AUDIO_DEVICE_NONE, OUTPUT_AUDIO_DEVICE_BT_A2DP);
 
-       pFrame = UiApp::GetInstance()->GetAppFrame()->GetFrame();
-       mainForm = static_cast<VideoPlayerForm*>(pFrame->GetCurrentForm());
+       UiApp* pApp = UiApp::GetInstance();
+       TryReturnVoid(pApp != null, "pApp is null");
+
+       IAppFrame* pAppFrame = pApp->GetAppFrame();
+       TryReturnVoid(pAppFrame != null, "pAppFrame is null");
+
+       Frame* pFrame = pAppFrame->GetFrame();
+       TryReturnVoid(pFrame != null, "pFrame is null");
+
+       VideoPlayerForm* pForm = static_cast<VideoPlayerForm*>(pFrame->GetCurrentForm());
+       TryReturnVoid(pForm != null, "pForm is null");
 
        switch (actionId)
        {
@@ -255,7 +262,7 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                        {
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_BT_A2DP)
                                {
-                                       r = mainForm->SetActiveAudioRoute(audioRouteBluetooth);
+                                       r = pForm->SetActiveAudioRoute(audioRouteBluetooth);
                                        TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s",
                                                        GetErrorMessage(r));
                                }
@@ -264,7 +271,7 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                        {
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_WIRED_ACCESSORY)
                                {
-                                       r = mainForm->SetActiveAudioRoute(audioRouteWiredAccessory);
+                                       r = pForm->SetActiveAudioRoute(audioRouteWiredAccessory);
                                        TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s",
                                                        GetErrorMessage(r));
                                }
@@ -273,7 +280,7 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                        {
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_BT_A2DP)
                                {
-                                       r = mainForm->SetActiveAudioRoute(audioRouteBluetooth);
+                                       r = pForm->SetActiveAudioRoute(audioRouteBluetooth);
                                        TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s",
                                                        GetErrorMessage(r));
                                }
@@ -298,8 +305,8 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                        {
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_SPEAKER)
                                {
-                                       r = mainForm->SetActiveAudioRoute(audioRouteSpeaker);
-                                       TryReturnVoid(r == E_SUCCESS, "mainForm->SetActiveAudioRoute() failed:%s",
+                                       r = pForm->SetActiveAudioRoute(audioRouteSpeaker);
+                                       TryReturnVoid(r == E_SUCCESS, "pForm->SetActiveAudioRoute() failed:%s",
                                                        GetErrorMessage(r));
                                }
                        }
@@ -307,8 +314,8 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                        {
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_SPEAKER)
                                {
-                                       r = mainForm->SetActiveAudioRoute(audioRouteSpeaker);
-                                       TryReturnVoid(r == E_SUCCESS, "mainForm->SetActiveAudioRoute() failed:%s",
+                                       r = pForm->SetActiveAudioRoute(audioRouteSpeaker);
+                                       TryReturnVoid(r == E_SUCCESS, "pForm->SetActiveAudioRoute() failed:%s",
                                                        GetErrorMessage(r));
                                }
                        }
@@ -316,8 +323,8 @@ SoundPathPopup::OnActionPerformed(const Control& source, int actionId)
                        {
                                if (currentAudioRoute.GetOutputAudioDevice() != OUTPUT_AUDIO_DEVICE_WIRED_ACCESSORY)
                                {
-                                       r = mainForm->SetActiveAudioRoute(audioRouteWiredAccessory);
-                                       TryReturnVoid(r == E_SUCCESS, "__pAudioRouteManager->SetActiveAudioRoute() failed:%s",
+                                       r = pForm->SetActiveAudioRoute(audioRouteWiredAccessory);
+                                       TryReturnVoid(r == E_SUCCESS, "pForm->SetActiveAudioRoute() failed:%s",
                                                        GetErrorMessage(r));
                                }
                        }
@@ -454,4 +461,4 @@ SoundPathPopup::OnUserEventReceivedN(RequestId requestId, IList* pArgs)
        default:
                break;
        }
-}
\ No newline at end of file
+}