openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol/openlp/fixes into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #598393 in OpenLP: "After adding a new image to a selected (image) item in the service manager it is not selected anymore"
  https://bugs.launchpad.net/openlp/+bug/598393
  Bug #719102 in OpenLP: "editing author after editing song causes traceback"
  https://bugs.launchpad.net/openlp/+bug/719102
  Bug #730979 in OpenLP: "Song export crashes"
  https://bugs.launchpad.net/openlp/+bug/730979
  Bug #747206 in OpenLP: "Missing dictionary for spell check prevents program start"
  https://bugs.launchpad.net/openlp/+bug/747206

For more details, see:
https://code.launchpad.net/~googol/openlp/fixes/+merge/110687

Hello,

- fixed non existing variable under certain conditions

If the list is empty the variable "file" is not created -> traceback. (But please do not ask me how I managed to drag zero images, I don't know myself.)

-- 
https://code.launchpad.net/~googol/openlp/fixes/+merge/110687
Your team OpenLP Core is requested to review the proposed merge of lp:~googol/openlp/fixes into lp:openlp.

=== modified file 'openlp/core/lib/mediamanageritem.py'
--- openlp/core/lib/mediamanageritem.py	2012-05-11 12:22:34 +0000
+++ openlp/core/lib/mediamanageritem.py	2012-06-17 15:49:18 +0000
@@ -349,8 +349,9 @@
         can run it.
 
         ``files``
-        The list of files to be loaded
+            The list of files to be loaded
         """
+        #FIXME: change local variables to words_separated_by_underscores.
         newFiles = []
         errorShown = False
         for file in files:
@@ -366,7 +367,7 @@
                     errorShown = True
             else:
                 newFiles.append(file)
-        if file:
+        if files:
             self.validateAndLoad(newFiles)
 
     def validateAndLoad(self, files):
@@ -377,6 +378,7 @@
         ``files``
             The files to be loaded.
         """
+        #FIXME: change local variables to words_separated_by_underscores.
         names = []
         fullList = []
         for count in range(self.listView.count()):