forked from openlp/openlp
Fix bug stopping Custom editing
bzr-revno: 691
This commit is contained in:
commit
34eebfd22f
@ -134,6 +134,7 @@ class SongXMLParser(object):
|
|||||||
``xml``
|
``xml``
|
||||||
The XML of the song to be parsed.
|
The XML of the song to be parsed.
|
||||||
"""
|
"""
|
||||||
|
self.song_xml = None
|
||||||
try:
|
try:
|
||||||
self.song_xml = ElementTree(
|
self.song_xml = ElementTree(
|
||||||
element=XML(unicode(xml).encode('unicode-escape')))
|
element=XML(unicode(xml).encode('unicode-escape')))
|
||||||
|
@ -106,7 +106,7 @@ class EditCustomForm(QtGui.QDialog, Ui_customEditDialog):
|
|||||||
for themename in themelist:
|
for themename in themelist:
|
||||||
self.ThemeComboBox.addItem(themename)
|
self.ThemeComboBox.addItem(themename)
|
||||||
|
|
||||||
def loadCustom(self, id, preview):
|
def loadCustom(self, id, preview=False):
|
||||||
self.customSlide = CustomSlide()
|
self.customSlide = CustomSlide()
|
||||||
self.initialise()
|
self.initialise()
|
||||||
if id != 0:
|
if id != 0:
|
||||||
|
@ -1 +1 @@
|
|||||||
1.9.0-690
|
1.9.0-691
|
||||||
|
Loading…
Reference in New Issue
Block a user