Merge lp:~phill-ridout/openlp/bug1154059_2.0 into lp:openlp/2.0
Proposed by
Phill
Status: | Merged |
---|---|
Approved by: | Andreas Preikschat |
Approved revision: | 2143 |
Merged at revision: | 2139 |
Proposed branch: | lp:~phill-ridout/openlp/bug1154059_2.0 |
Merge into: | lp:openlp/2.0 |
Diff against target: |
31 lines (+14/-7) 1 file modified
openlp/core/ui/media/phononplayer.py (+14/-7) |
To merge this branch: | bzr merge lp:~phill-ridout/openlp/bug1154059_2.0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andreas Preikschat (community) | Approve | ||
Raoul Snyman | Approve | ||
Review via email: mp+153476@code.launchpad.net |
This proposal supersedes a proposal from 2013-03-12.
Description of the change
Fixes #1154059 catching Unicode decode error.
Changed extension to *.* rather than just *
To post a comment you must log in.
I think this extensions_ list = [u'*'] extensions_ list = [u'*']
27 + self.audio_
28 + self.video_
should rather be
self.audio_ extensions_ list = [u'*.*'] extensions_ list = [u'*.*']
self.video_