openlp-core team mailing list archive

[Tomas Groth <tomasgroth@xxxxxxxx>]

Tomas Groth has proposed merging lp:~tomasgroth/openlp/bug719514-2.0 into lp:openlp/2.0.

Requested reviews:
  OpenLP Core (openlp-core)
Related bugs:
  Bug #719514 in OpenLP: "Themes: <file> and <otherfile> are the same file"
  https://bugs.launchpad.net/openlp/+bug/719514

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/bug719514-2.0/+merge/223184

Fix for #719514 'Themes: <file> and <otherfile> are the same file'
-- 
https://code.launchpad.net/~tomasgroth/openlp/bug719514-2.0/+merge/223184
Your team OpenLP Core is requested to review the proposed merge of lp:~tomasgroth/openlp/bug719514-2.0 into lp:openlp/2.0.

=== modified file 'openlp/core/ui/thememanager.py'
--- openlp/core/ui/thememanager.py	2014-01-14 19:25:18 +0000
+++ openlp/core/ui/thememanager.py	2014-06-15 20:39:54 +0000
@@ -698,7 +698,7 @@
         finally:
             if out_file:
                 out_file.close()
-        if image_from and image_from != image_to:
+        if image_from and os.path.abspath(image_from) != os.path.abspath(image_to):
             try:
                 encoding = get_filesystem_encoding()
                 shutil.copyfile(