forked from openlp/openlp
Do not display alert on a single screen when 'Display on a single screen' is not checked. Fixes bug 1423956.
This commit is contained in:
parent
df9594e11d
commit
de58d1c607
@ -26,7 +26,7 @@ displaying of alerts.
|
|||||||
|
|
||||||
from PyQt4 import QtCore
|
from PyQt4 import QtCore
|
||||||
|
|
||||||
from openlp.core.common import OpenLPMixin, RegistryMixin, Registry, RegistryProperties, translate
|
from openlp.core.common import OpenLPMixin, RegistryMixin, Registry, RegistryProperties, Settings, translate
|
||||||
|
|
||||||
|
|
||||||
class AlertsManager(OpenLPMixin, RegistryMixin, QtCore.QObject, RegistryProperties):
|
class AlertsManager(OpenLPMixin, RegistryMixin, QtCore.QObject, RegistryProperties):
|
||||||
@ -70,7 +70,8 @@ class AlertsManager(OpenLPMixin, RegistryMixin, QtCore.QObject, RegistryProperti
|
|||||||
"""
|
"""
|
||||||
Format and request the Alert and start the timer.
|
Format and request the Alert and start the timer.
|
||||||
"""
|
"""
|
||||||
if not self.alert_list:
|
if not self.alert_list or (self.live_controller.display.screens.display_count == 1
|
||||||
|
and not Settings().value('core/display on monitor')):
|
||||||
return
|
return
|
||||||
text = self.alert_list.pop(0)
|
text = self.alert_list.pop(0)
|
||||||
alert_tab = self.parent().settings_tab
|
alert_tab = self.parent().settings_tab
|
||||||
|
Loading…
Reference in New Issue
Block a user