fix omitting custom sounds

This commit is contained in:
TingPing 2013-04-23 00:45:37 -04:00
parent bd73c80152
commit 2550a94f05
2 changed files with 13 additions and 13 deletions

View File

@ -2186,6 +2186,8 @@ char *sound_files[NUM_XP];
void void
sound_beep (session *sess) sound_beep (session *sess)
{
if (!prefs.hex_gui_focus_omitalerts || !fe_gui_info (sess, 0) == 1)
{ {
if (sound_files[XP_TE_BEEP] && sound_files[XP_TE_BEEP][0]) if (sound_files[XP_TE_BEEP] && sound_files[XP_TE_BEEP][0])
/* user defined beep _file_ */ /* user defined beep _file_ */
@ -2194,6 +2196,7 @@ sound_beep (session *sess)
/* system beep */ /* system beep */
fe_beep (sess); fe_beep (sess);
} }
}
static char * static char *
sound_find_command (void) sound_find_command (void)

View File

@ -671,8 +671,6 @@ fe_beep (session *sess)
{ {
char *beepfile; char *beepfile;
if (!prefs.hex_gui_focus_omitalerts || !fe_gui_info (sess, 0) == 1)
{
#ifdef WIN32 /* keep this in sync with cfgfiles.c! */ #ifdef WIN32 /* keep this in sync with cfgfiles.c! */
beepfile = g_build_filename (HEXCHATSHAREDIR, "share", "sounds", "beep.wav", NULL); beepfile = g_build_filename (HEXCHATSHAREDIR, "share", "sounds", "beep.wav", NULL);
#else #else
@ -681,7 +679,6 @@ fe_beep (session *sess)
sound_play (beepfile, TRUE, TRUE); sound_play (beepfile, TRUE, TRUE);
g_free (beepfile); g_free (beepfile);
} }
}
void void
fe_lastlog (session *sess, session *lastlog_sess, char *sstr, gtk_xtext_search_flags flags) fe_lastlog (session *sess, session *lastlog_sess, char *sstr, gtk_xtext_search_flags flags)