[MPlayer-cvslog] r36820 - in trunk/gui: dialog/preferences.c win32/preferences.c

[ib]

Author: ib
Date: Sun Feb  9 18:55:11 2014
New Revision: 36820

Log:
Make message box less annoying.

Show information that playback needs restart only during playback.

Modified:
   trunk/gui/dialog/preferences.c
   trunk/gui/win32/preferences.c

Modified: trunk/gui/dialog/preferences.c
==============================================================================
--- trunk/gui/dialog/preferences.c	Sun Feb  9 18:53:28 2014	(r36819)
+++ trunk/gui/dialog/preferences.c	Sun Feb  9 18:55:11 2014	(r36820)
@@ -386,7 +386,7 @@ static void prButton( GtkButton * button
 	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;

Modified: trunk/gui/win32/preferences.c
==============================================================================
--- trunk/gui/win32/preferences.c	Sun Feb  9 18:53:28 2014	(r36819)
+++ trunk/gui/win32/preferences.c	Sun Feb  9 18:55:11 2014	(r36820)
@@ -632,9 +632,13 @@ static LRESULT CALLBACK PrefsWndProc(HWN
                     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;
                 }