From 13328322307cde0c9fdd62bfccbcf4a78404164b Mon Sep 17 00:00:00 2001
From: mkaay <mkaay@mkaay.de>
Date: Tue, 15 Dec 2009 23:09:09 +0100
Subject: incomplete: stable gui O.o, folder fix

---
 module/download_thread.py | 2 +-
 module/file_list.py       | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'module')

diff --git a/module/download_thread.py b/module/download_thread.py
index 539f3e62f..be7896b5f 100644
--- a/module/download_thread.py
+++ b/module/download_thread.py
@@ -127,7 +127,7 @@ class Download_Thread(threading.Thread):
 
         status.type = "downloading"
         
-        local_file = pyfile.download_folder + "/" + status.filename
+        local_file = pyfile.folder + "/" + status.filename
         pyfile.plugin.proceed(status.url, local_file)
 
         status.type = "checking"
diff --git a/module/file_list.py b/module/file_list.py
index 2bfe37298..ea4fd5767 100644
--- a/module/file_list.py
+++ b/module/file_list.py
@@ -203,7 +203,7 @@ class File_List(object):
             """
             pyfile = PyLoadFile(url, collector.file_list)
             pyfile.id = collector._getFreeID()
-            pyfile.download_folder =  collector.file_list.download_folder
+            pyfile.folder =  collector.file_list.download_folder
             collector.file_list.lock.acquire()
             collector.file_list.data["collector"].append(pyfile)
             collector.file_list.lock.release()
@@ -363,19 +363,18 @@ class PyLoadPackage():
         self.data = {
             "id": None,
             "package_name": "new_package",
-            "folder": None
+            "folder": ""
         }
 
 class PyLoadFile():
     def __init__(self, url, file_list):
         self.id = None
         self.url = url
-        self.folder = None
+        self.folder = ""
         self.file_list = file_list
         self.core = file_list.core
         self.package = None
         self.filename = "n/a"
-        self.download_folder = ""
         self.active = False
         pluginName = self._get_my_plugin()
         if pluginName:
-- 
cgit v1.2.3