revert parts of 5ae1480

jrhames · Feb 7, 2011 · 39255cc · 39255cc
1 parent 3c1646a
commit 39255cc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/script.xbmc.subtitles/changelog.txt b/script.xbmc.subtitles/changelog.txt
@@ -1,7 +1,5 @@
 2.2.6
 - added: theSubDB, thanks to jrhames
-- added: open addon settings from the service window
-- removed: legacy window support
 
 2.2.5
 - added: Added storing of Bierdopje show ids to reduce the number of api calls. thx mr_blobby

diff --git a/script.xbmc.subtitles/resources/lib/gui.py b/script.xbmc.subtitles/resources/lib/gui.py
@@ -116,7 +116,7 @@ def set_allparam(self):
       else:
         self.file_name = "%s (%s)" % (self.title.encode('utf-8'), str(self.year),)    
 
-    self.tmp_sub_dir = xbmc.translatePath(os.path.join( __profile__ ,"sub_tmp" ))
+    self.tmp_sub_dir = os.path.join( __profile__ ,"sub_tmp" )
 
     if not self.tmp_sub_dir.endswith(':') and not os.path.exists(self.tmp_sub_dir):
       os.makedirs(self.tmp_sub_dir)
@@ -238,7 +238,6 @@ def Search_Subtitles( self ):
         self.getControl( STATUS_LABEL ).setLabel( msg )
       else:
         self.getControl( STATUS_LABEL ).setLabel( _( 657 ) )
-
       self.setFocusId( SERVICES_LIST )
       self.getControl( SERVICES_LIST ).selectItem( 0 )
 
@@ -274,7 +273,7 @@ def Download_Subtitles( self, pos ):
         file_name = "%s.%s%s" % ( sub_name, sub_lang, sub_ext )
       else:
         file_name = "%s%s" % ( sub_name, sub_ext )
-      file_from = os.path.join(self.tmp_sub_dir, "zipsubs.zip").replace('\\','/')
+      file_from = file.replace('\\','/')
       file_to = os.path.join(self.sub_folder, file_name).replace('\\','/')
       try:
         shutil.copyfile(file_from, file_to)