Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Throws Error when attempting to define more than one default display #376

Merged
merged 5 commits into from
Jun 30, 2019
Merged

Throws Error when attempting to define more than one default display #376

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1577768
Throws AssertionError when attempting to define more than one default…
Jun 25, 2019
bbc7bc7
Resolved PR change requests
Jun 25, 2019
85cd055
Changed tab indentations to spaces
Jun 25, 2019
1dfdab5
Shortened line 153 by wrapping to new line
Jun 25, 2019
2cf6294
Removed hanging indent
Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Authors & Contributors

* Brian Madden <brian@missionpinball.org>
* Quinn Capen <qcapen@gmail.com>
* Brian Williams <brian.williams0019@gmail.com>
10 changes: 7 additions & 3 deletions mpfmc/uix/display.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,14 +139,18 @@ def _display_created(self, *args) -> None:
self.size = self.native_size
Clock.schedule_once(self._display_created, 0)
return

# Add this display to the list of all available displays
self.mc.displays[self.name] = self

# If this display is configured as the default, set it
# If this display is configured as the default, set it.
# If this display would overwrite an existing default, raise an AssertionError.
try:
if self.config['default']:
self.mc.targets['default'] = self
if 'default' not in self.mc.targets:
self.mc.targets['default'] = self
else:
raise AssertionError('Multiple displays have been set as the default. Please choose a single \
display to default to (\"{}\" is currently set as the default).'.format(self.mc.targets['default'].name))
except KeyError:
pass

Expand Down