openlp-core team mailing list archive

[Raoul Snyman <raoul.snyman@xxxxxxxxxxxxxxxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/new-song-bug into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  #640460 Add two songs in a row, and the first one gets lost
  https://bugs.launchpad.net/bugs/640460


Fix bug #640460.
-- 
https://code.launchpad.net/~raoul-snyman/openlp/new-song-bug/+merge/35867
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/new-song-bug into lp:openlp.

=== modified file 'openlp/plugins/songs/forms/editsongform.py'
--- openlp/plugins/songs/forms/editsongform.py	2010-09-07 16:12:47 +0000
+++ openlp/plugins/songs/forms/editsongform.py	2010-09-17 19:06:06 +0000
@@ -621,6 +621,10 @@
             self.close()
 
     def saveSong(self):
+        """
+        Get all the data from the widgets on the form, and then save it to the
+        database.
+        """
         self.song.title = unicode(self.TitleEditItem.text())
         self.song.alternate_title = unicode(self.AlternativeEdit.text())
         self.song.copyright = unicode(self.CopyrightEditItem.text())
@@ -646,6 +650,7 @@
                 self.song.topics.append(self.songmanager.get_object(Topic,
                     topicId))
             self.songmanager.save_object(self.song)
+            self.song = None
             return True
         return False