Mercurial > mplayer.hg

changeset 36724:3561e179b25c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make message box less annoying. Show information that playback needs restart only during playback.
author ib
date Sun, 09 Feb 2014 17:55:11 +0000
parents d115f34f2f23
children 31138a69aee6
files gui/dialog/preferences.c gui/win32/preferences.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/preferences.c	Sun Feb 09 17:53:28 2014 +0000
+++ b/gui/dialog/preferences.c	Sun Feb 09 17:55:11 2014 +0000
@@ -386,7 +386,7 @@
 	setdup( &dvd_device,gtk_entry_get_text( GTK_ENTRY( prEDVDDevice ) ) );
 	setdup( &cdrom_device,gtk_entry_get_text( GTK_ENTRY( prECDRomDevice ) ) );
 
-	if ( inform )
+	if ( guiInfo.Playing && inform )
 	 {
 	  gtkMessageBox( MSGBOX_INFORMATION,MSGTR_GUI_MSG_PlaybackNeedsRestart );
 	  inform = False;
--- a/gui/win32/preferences.c	Sun Feb 09 17:53:28 2014 +0000
+++ b/gui/win32/preferences.c	Sun Feb 09 17:55:11 2014 +0000
@@ -632,9 +632,13 @@
                     else if(SendDlgItemMessage(hwnd, ID_OSD3, BM_GETCHECK, 0, 0) == BST_CHECKED)
                         osd_level = 3;
 
+                    if (guiInfo.Playing)
+                    {
                     caption = strdup(acp(MSGTR_GUI_Information));
                     MessageBox(hwnd, acp(MSGTR_GUI_MSG_PlaybackNeedsRestart), caption, MB_OK | MB_ICONINFORMATION);
                     free(caption);
+                    }
+
                     DestroyWindow(hwnd);
                     break;
                 }