summaryrefslogtreecommitdiffstats
path: root/pyload/plugins/addon/MergeFiles.py
diff options
context:
space:
mode:
Diffstat (limited to 'pyload/plugins/addon/MergeFiles.py')
-rw-r--r--pyload/plugins/addon/MergeFiles.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugins/addon/MergeFiles.py b/pyload/plugins/addon/MergeFiles.py
index 0c9b05283..8a2573409 100644
--- a/pyload/plugins/addon/MergeFiles.py
+++ b/pyload/plugins/addon/MergeFiles.py
@@ -7,7 +7,7 @@ import re
from traceback import print_exc
-from pyload.plugins.internal.Addon import Addon, threaded
+from pyload.plugins.Addon import Addon, threaded
from pyload.utils import safe_join, fs_encode
@@ -50,7 +50,7 @@ class MergeFiles(Addon):
for name, file_list in files.iteritems():
self.logInfo(_("Starting merging of"), name)
- final_file = open(save_join(download_folder, name), "wb")
+ final_file = open(safe_join(download_folder, name), "wb")
for splitted_file in file_list:
self.logDebug("Merging part", splitted_file)