This commit is contained in:
karxi 2017-05-08 23:45:11 -04:00
parent ad8db40d54
commit 961a86527c

View file

@ -1440,13 +1440,11 @@ class PesterWindow(MovingWindow):
convo.addMessage(msg, False) convo.addMessage(msg, False)
# play sound here # play sound here
if self.config.soundOn(): if self.config.soundOn():
if self.config.chatSound(): if self.config.chatSound() or convo.always_beep:
if msg in ["PESTERCHUM:CEASE", "PESTERCHUM:BLOCK"]: if msg in ["PESTERCHUM:CEASE", "PESTERCHUM:BLOCK"]:
self.ceasesound.play() self.ceasesound.play()
else: else:
self.alarm.play() self.alarm.play()
elif convo.always_beep:
self.alarm.play()
def newMemoMsg(self, chan, handle, msg): def newMemoMsg(self, chan, handle, msg):
if not self.memos.has_key(chan): if not self.memos.has_key(chan):
# silently ignore in case we forgot to /part # silently ignore in case we forgot to /part