diff options
| author | Julien Valroff <julien@kirya.net> | 2012-06-26 20:47:28 +0200 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2012-06-26 20:47:28 +0200 |
| commit | 70572245101637651d6e88fc323171205d6a7306 (patch) | |
| tree | ef64c3789f70ff4b93a186beb766c94cba1cac7f /rapid/filemodify.py | |
| parent | 78bd370ebdbd4b69e25edb5825628d5b00865699 (diff) | |
| parent | 2a794565f77005a753930023e41c7b696eaed6ac (diff) | |
Merge tag 'upstream/0.4.5'
Upstream version 0.4.5
Diffstat (limited to 'rapid/filemodify.py')
| -rw-r--r-- | rapid/filemodify.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rapid/filemodify.py b/rapid/filemodify.py index 8e5d8a3..98921ae 100644 --- a/rapid/filemodify.py +++ b/rapid/filemodify.py @@ -72,7 +72,11 @@ class FileModify(multiprocessing.Process): while not copy_finished: logger.debug("Finished %s. Getting next task.", download_count) - rpd_file, download_count, temp_full_file_name, thumbnail_icon, thumbnail, copy_finished = self.results_pipe.recv() + data = self.results_pipe.recv() + if len(data) > 2: + rpd_file, download_count, temp_full_file_name, thumbnail_icon, thumbnail, copy_finished = data + else: + rpd_file, copy_finished = data if rpd_file is None: # this is a termination signal logger.info("Terminating file modify via pipe") |