Merge lp:~tomasgroth/openlp/23bugfixes2 into lp:openlp
Proposed by
Tomas Groth
Status: | Merged |
---|---|
Approved by: | Tim Bentley |
Approved revision: | 2616 |
Merged at revision: | 2616 |
Proposed branch: | lp:~tomasgroth/openlp/23bugfixes2 |
Merge into: | lp:openlp |
Diff against target: |
170 lines (+51/-11) 5 files modified
openlp/core/ui/maindisplay.py (+18/-0) openlp/core/ui/slidecontroller.py (+2/-5) openlp/plugins/presentations/lib/messagelistener.py (+1/-0) openlp/plugins/songs/lib/importers/easyworship.py (+6/-6) tests/functional/openlp_plugins/presentations/test_messagelistener.py (+24/-0) |
To merge this branch: | bzr merge lp:~tomasgroth/openlp/23bugfixes2 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Bentley | Approve | ||
Raoul Snyman | Approve | ||
Review via email: mp+285281@code.launchpad.net |
Description of the change
More workarounds for bug 1531319.
If presentation loading fails, set slidenumber to 0 to avoid a later error. Fixes bug 1490508. Added test.
Use the chosen encoding when importing from easyworship db.
To post a comment you must log in.
lp:~tomasgroth/openlp/23bugfixes2 (revision 2616) /ci.openlp. io/job/ Branch- 01-Pull/ 1277/ /ci.openlp. io/job/ Branch- 02-Functional- Tests/1201/ /ci.openlp. io/job/ Branch- 03-Interface- Tests/1140/ /ci.openlp. io/job/ Branch- 04a-Windows_ Functional_ Tests/976/ /ci.openlp. io/job/ Branch- 04b-Windows_ Interface_ Tests/568/ /ci.openlp. io/job/ Branch- 05a-Code_ Analysis/ 638/ /ci.openlp. io/job/ Branch- 05b-Test_ Coverage/ 507/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[SUCCESS] https:/
[FAILURE] https:/