Fix N_SE-38143

Change-Id: I5915233cc98e238e0d87c603ce98c7905dfb139f

diff --git a/src/VpVideoPlayerForm.cpp b/src/VpVideoPlayerForm.cpp
index dc91094..5f371a0 100755 (executable)
--- a/src/VpVideoPlayerForm.cpp
+++ b/src/VpVideoPlayerForm.cpp
@@ -699,19 +699,15 @@ VideoPlayerForm::OnPlayErrorOccurred(PlayerErrorReason r)
        {
        case PLAYER_ERROR_INVALID_DATA:
                {
-                       if ((__pVideoPlayerPresentationModel->GetMediaPathName().EndsWith(L"flv") == true)
-                               || (__pVideoPlayerPresentationModel->GetMediaPathName().EndsWith(L"FLV") == true))
-                       {
-                               pAppResource = Application::GetInstance()->GetAppResource();
-                               pAppResource->GetString(IDS_COM_POP_UNSUPPORTED_FILE_TYPE, messageBoxString);
+                       pAppResource = Application::GetInstance()->GetAppResource();
+                       pAppResource->GetString(IDS_COM_POP_UNSUPPORTED_FILE_TYPE, messageBoxString);
 
-                               messageBox.Construct(L"", messageBoxString, MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
-                               messageBox.ShowAndWait(modalResult);
+                       messageBox.Construct(L"", messageBoxString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+                       messageBox.ShowAndWait(modalResult);
 
-                               AppLogDebug("OnPlayErrorOccurred : pApp->Terminate");
-                               UiApp* pApp = UiApp::GetInstance();
-                               pApp->Terminate();
-                       }
+                       UiApp* pApp = UiApp::GetInstance();
+                       TryReturnVoid(pApp != null, "pApp is null");
+                       pApp->Terminate();
                }
                break;
 
@@ -720,11 +716,11 @@ VideoPlayerForm::OnPlayErrorOccurred(PlayerErrorReason r)
                        pAppResource = Application::GetInstance()->GetAppResource();
                        pAppResource->GetString(IDS_VPL_POP_UNABLE_TO_PLAY_VIDEO_ERROR_OCCURRED, messageBoxString);
 
-                       messageBox.Construct(L"", messageBoxString, MSGBOX_STYLE_OK, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+                       messageBox.Construct(L"", messageBoxString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
                        messageBox.ShowAndWait(modalResult);
 
-                       AppLogDebug("OnPlayErrorOccurred : pApp->Terminate");
                        UiApp* pApp = UiApp::GetInstance();
+                       TryReturnVoid(pApp != null, "pApp is null");
                        pApp->Terminate();
                }
                break;

diff --git a/src/VpVideoPlayerPresentationModel.cpp b/src/VpVideoPlayerPresentationModel.cpp
index 7dd7323..2167b72 100755 (executable)
--- a/src/VpVideoPlayerPresentationModel.cpp
+++ b/src/VpVideoPlayerPresentationModel.cpp
@@ -346,7 +346,7 @@ VideoPlayerPresentationModel::StartPlay(void)
                                String messageBoxString;
                                pAppResource->GetString(IDS_COM_POP_UNSUPPORTED_FILE_TYPE, messageBoxString);
                                MessageBox messageBox;
-                               messageBox.Construct(L"", messageBoxString, MSGBOX_STYLE_OK, 3000);
+                               messageBox.Construct(L"", messageBoxString, MSGBOX_STYLE_NONE, 3000);
                                int modalResult = 0;
                                messageBox.ShowAndWait(modalResult);