N_SE-39067

Change-Id: I5f6c818a844d414c29535f7f11449022723959b4

diff --git a/src/VpMainFrame.cpp b/src/VpMainFrame.cpp
old mode 100644 (file)
new mode 100755 (executable)
index a23b7ed..471bcf8
--- a/src/VpMainFrame.cpp
+++ b/src/VpMainFrame.cpp
@@ -28,6 +28,7 @@
 
 using namespace Tizen::Base;
 using namespace Tizen::Media;
+using namespace Tizen::System;
 using namespace Tizen::Ui;
 using namespace Tizen::Ui::Controls;
 using namespace Tizen::Ui::Scenes;
@@ -94,6 +95,9 @@ MainFrame::OnFrameActivated(const Frame& source)
                        }
                }
        }
+
+       result r = PowerManager::KeepScreenOnState(true, false);
+       TryReturnVoid(r == E_SUCCESS, "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
 }
 
 void
@@ -117,6 +121,9 @@ MainFrame::OnFrameDeactivated(const Frame& source)
                        }
                }
        }
+
+       result r = PowerManager::KeepScreenOnState(false);
+       TryReturnVoid(r == E_SUCCESS, "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
 }
 
 void

diff --git a/src/VpVideoPlayerForm.cpp b/src/VpVideoPlayerForm.cpp
index 88422e9..a3942b1 100755 (executable)
--- a/src/VpVideoPlayerForm.cpp
+++ b/src/VpVideoPlayerForm.cpp
@@ -530,9 +530,6 @@ VideoPlayerForm::OnSceneActivatedN(const SceneId& previousSceneId, const SceneId
        __pTotalTimeLabel->Invalidate(true);
 
        SetScreenModeButtonImage();
-
-       r = PowerManager::KeepScreenOnState(true, false);
-       TryReturnVoid(r == E_SUCCESS, "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
 }
 
 void
@@ -544,9 +541,6 @@ VideoPlayerForm::OnSceneDeactivated(const SceneId& currentSceneId, const SceneId
 
        r = __pVideoPlayerPresentationModel->PausePlay();
        TryReturnVoid(r == E_SUCCESS, "__pVideoPlayerPresentationModel->PausePlay() failed:%s", GetErrorMessage(r));
-
-       r = PowerManager::KeepScreenOnState(false);
-       TryReturnVoid(r == E_SUCCESS, "PowerManager::KeepScreenOnState() failed:%s", GetErrorMessage(r));
 }
 
 void