raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

review comments applied

Browse Source
This commit is contained in:
robbiejackson 2021-05-26 08:56:20 +01:00
parent 4ff585a774
commit 1feeadf3bb
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openlp/core/display/screens.py
View File

@ -256,14 +256,12 @@ class ScreenList(metaclass=Singleton):
screen_settings = self.settings.value('core/screens') screen_settings = self.settings.value('core/screens')
if screen_settings: if screen_settings:
need_new_display_screen = False need_new_display_screen = False
for number, screen_dict in screen_settings.items(): for screen_dict in screen_settings.values():
# Sometimes this loads as a string instead of an int
number = int(number)
# Compare geometry, primary of screen from settings with available screens # Compare geometry, primary of screen from settings with available screens
matched_screen = self.match_screen(screen_dict) screen_number = self.get_screen_number(screen_dict)
if matched_screen is not None: if screen_number is not None:
# If match was found, we're all happy, update with custom geometry, display info, if available # If match was found, we're all happy, update with custom geometry, display info, if available
self[matched_screen].update(screen_dict) self[screen_number].update(screen_dict)
else: else:
# If no match, ignore this screen, also need to find new display screen if the discarded screen was # If no match, ignore this screen, also need to find new display screen if the discarded screen was
# marked as such. # marked as such.
@ -333,7 +331,7 @@ class ScreenList(metaclass=Singleton):
if can_save: if can_save:
self.save_screen_settings() self.save_screen_settings()
def match_screen(self, screen_dict): def get_screen_number(self, screen_dict):
""" """
Tries to match a screen with the passed-in screen_dict attributes Tries to match a screen with the passed-in screen_dict attributes
If a match is found then the number of the screen is returned. If a match is found then the number of the screen is returned.