Merge lp:~tomasgroth/openlp/bugfixes15 into lp:openlp
Proposed by
Tomas Groth
Status: | Merged |
---|---|
Approved by: | Raoul Snyman |
Approved revision: | 2509 |
Merged at revision: | 2510 |
Proposed branch: | lp:~tomasgroth/openlp/bugfixes15 |
Merge into: | lp:openlp |
Diff against target: |
76 lines (+30/-3) 3 files modified
openlp/core/ui/media/mediacontroller.py (+3/-0) openlp/plugins/alerts/lib/alertsmanager.py (+3/-2) tests/functional/openlp_core_ui_media/test_mediacontroller.py (+24/-1) |
To merge this branch: | bzr merge lp:~tomasgroth/openlp/bugfixes15 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Raoul Snyman | Approve | ||
Tim Bentley | Approve | ||
Review via email: mp+250532@code.launchpad.net |
This proposal supersedes a proposal from 2015-02-21.
Description of the change
Don't try to play media if no players are available. Fixes bug 1422761.
Do not display alert on a single screen when 'Display on a single screen' is not checked. Fixes bug 1423956.
To post a comment you must log in.
lp:~tomasgroth/openlp/bugfixes15 (revision 2509) ci.openlp. org/job/ Branch- 01-Pull/ 972/ ci.openlp. org/job/ Branch- 02-Functional- Tests/898/ ci.openlp. org/job/ Branch- 03-Interface- Tests/841/ ci.openlp. org/job/ Branch- 04a-Windows_ Functional_ Tests/731/ ci.openlp. org/job/ Branch- 04b-Windows_ Interface_ Tests/330/ ci.openlp. org/job/ Branch- 05a-Code_ Analysis/ 467/ ci.openlp. org/job/ Branch- 05b-Test_ Coverage/ 338/
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://
[SUCCESS] http://