codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #2169 : Add Torrent Dialog 'Download Location' not set correctly when folder typed into Other->Location field 

Using get_current_folder() in the file chooser will use the default folder when a folder path has been typed into the Location field rather than selected with mouse. The solution is to replace it with get_filename().

Conflicts:

	deluge/ui/gtkui/addtorrentdialog.py
This commit is contained in:
Calum Lind 2012-10-06 22:54:33 +01:00
parent 0a36baa7d7
commit a18bdcf7cd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deluge/plugins/Extractor/deluge/plugins/extractor/gtkui.py
View File

@ -68,7 +68,7 @@ class GtkUI(GtkPluginBase):
def on_apply_prefs(self): def on_apply_prefs(self):
log.debug("applying prefs for Extractor") log.debug("applying prefs for Extractor")
if client.is_localhost(): if client.is_localhost():
path = self.glade.get_widget("folderchooser_path").get_current_folder() path = self.glade.get_widget("folderchooser_path").get_filename()
else: else:
path = self.glade.get_widget("entry_path").get_text() path = self.glade.get_widget("entry_path").get_text()

2
deluge/ui/gtkui/addtorrentdialog.py
View File

@ -418,7 +418,7 @@ class AddTorrentDialog(component.Component):
if client.is_localhost(): if client.is_localhost():
options["download_location"] = \ options["download_location"] = \
self.builder.get_object("button_location").get_current_folder() self.builder.get_object("button_location").get_filename()
else: else:
options["download_location"] = \ options["download_location"] = \
self.builder.get_object("entry_download_path").get_text() self.builder.get_object("entry_download_path").get_text()

2
deluge/ui/gtkui/options_tab.py
View File

@ -250,7 +250,7 @@ class OptionsTab(Tab):
) )
if self.chk_move_completed.get_active(): if self.chk_move_completed.get_active():
if client.is_localhost(): if client.is_localhost():
path = self.filechooser_move_completed.get_current_folder() path = self.filechooser_move_completed.get_filename()
else: else:
path = self.entry_move_completed.get_text() path = self.entry_move_completed.get_text()
client.core.set_torrent_move_completed_path(self.prev_torrent_id, path) client.core.set_torrent_move_completed_path(self.prev_torrent_id, path)