diff options
author | ardi69 <armin@diedering.de> | 2015-04-16 22:33:28 +0200 |
---|---|---|
committer | ardi69 <armin@diedering.de> | 2015-04-16 22:33:28 +0200 |
commit | 21c2ac71d045ae50a705d8ab0ac1e960d462e001 (patch) | |
tree | 896ff1eaae9151d83be150735c96a37a61d2d038 /pyload/plugin/addon/MergeFiles.py | |
parent | fixed: more typos (diff) | |
parent | Merge pull request #5 from ardi69/0.4.10 (diff) | |
download | pyload-21c2ac71d045ae50a705d8ab0ac1e960d462e001.tar.xz |
Merge pull request #2 from vuolter/0.4.10
merge from vuolter
Diffstat (limited to 'pyload/plugin/addon/MergeFiles.py')
-rw-r--r-- | pyload/plugin/addon/MergeFiles.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pyload/plugin/addon/MergeFiles.py b/pyload/plugin/addon/MergeFiles.py index dfc5f41d4..4f95ef9d7 100644 --- a/pyload/plugin/addon/MergeFiles.py +++ b/pyload/plugin/addon/MergeFiles.py @@ -37,9 +37,9 @@ class MergeFiles(Addon): files[data['name'][:-4]].sort() fid_dict[data['name']] = fid - download_folder = self.config['general']['download_folder'] + download_folder = self.config.get("general", "download_folder") - if self.config['general']['folder_per_package']: + if self.config.get("general", "folder_per_package"): download_folder = fs_join(download_folder, pack.folder) for name, file_list in files.iteritems(): |