Backport of [13378]

diff --git a/modules/video_output/directx/events.c b/modules/video_output/directx/events.c
index f7dd749071f630c66014cf6cf917e1232627d4ae..509aae4c2a5d091d9539d5caf0f5d6c650c8ac52 100644 (file)
--- a/modules/video_output/directx/events.c
+++ b/modules/video_output/directx/events.c
@@ -736,7 +736,7 @@ static long FAR PASCAL DirectXEventProc( HWND hwnd, UINT message,
 
     /* Catch the screensaver and the monitor turn-off */
     if( message == WM_SYSCOMMAND &&
-        ( wParam == SC_SCREENSAVE || wParam == SC_MONITORPOWER ) )
+        ( (wParam & 0xFFF0) == SC_SCREENSAVE || (wParam & 0xFFF0) == SC_MONITORPOWER ) )
     {
         //if( p_vout ) msg_Dbg( p_vout, "WinProc WM_SYSCOMMAND screensaver" );
         return 0; /* this stops them from happening */

diff --git a/modules/video_output/wingdi.c b/modules/video_output/wingdi.c
index 34723464a4b29d513565c8d9defb325738d6efb3..7f413becf8104f2ffbefa8abe79c03d7233a3ee8 100644 (file)
--- a/modules/video_output/wingdi.c
+++ b/modules/video_output/wingdi.c
@@ -1062,7 +1062,7 @@ static long FAR PASCAL WndProc( HWND hWnd, UINT message,
 #ifndef UNDER_CE
     /* Catch the screensaver and the monitor turn-off */
     if( message == WM_SYSCOMMAND &&
-        ( wParam == SC_SCREENSAVE || wParam == SC_MONITORPOWER ) )
+        ( (wParam & 0xFFF0) == SC_SCREENSAVE || (wParam & 0xFFF0) == SC_MONITORPOWER ) )
     {
         //if( p_vout ) msg_Dbg( p_vout, "WinProc WM_SYSCOMMAND screensaver" );
         return 0; /* this stops them from happening */