Make sure presentations is closed correctly. Fixes bug 1490996.

Fixes: https://launchpad.net/bugs/1490996
This commit is contained in:
Tomas Groth 2015-09-03 20:21:43 +01:00
parent 964af5fc92
commit fec061782b

View File

@ -902,7 +902,8 @@ class SlideController(DisplayController, RegistryProperties):
# This avoids the service theme/desktop flashing on screen
# However opening a new item of the same type will automatically
# close the previous, so make sure we don't close the new one.
if old_item.is_command() and not service_item.is_command():
if old_item.is_command() and not service_item.is_command() or \
old_item.is_command() and not old_item.is_media() and service_item.is_media():
Registry().execute('%s_stop' % old_item.name.lower(), [old_item, self.is_live])
if old_item.is_media() and not service_item.is_media():
self.on_media_close()