vm: fix calling monitor layout notifier

This commit is contained in:
Marek Marczykowski-Górecki 2016-02-09 00:26:03 +01:00 committed by Wojtek Porczyk
parent 4095f3c5eb
commit ab469e4473

View File

@ -1030,7 +1030,9 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
# TODO event, extension
def notify_monitor_layout(self):
monitor_layout = qubes.monitor_layout.get_monitor_layout()
try:
import qubes.monitorlayoutnotify
monitor_layout = qubes.monitorlayoutnotify.get_monitor_layout()
# notify qube only if we've got a non-empty monitor_layout or else we
# break proper qube resolution set by gui-agent
@ -1038,7 +1040,9 @@ class QubesVM(qubes.vm.mix.net.NetVMMixin, qubes.vm.BaseVM):
return
self.log.info('Sending monitor layout')
qubes.monitor_layout.notify_vm(self, monitor_layout)
qubes.monitorlayoutnotify.notify_vm(self, monitor_layout)
except ImportError:
self.log.warning('Monitor layout notify module not installed')
# TODO move to storage