From 444f11c6a29d7dc139ce913cab5a249f10db5b9c Mon Sep 17 00:00:00 2001 From: project-owner Date: Sun, 22 Dec 2019 21:38:19 -0800 Subject: [PATCH] Cranach Edition --- ui/menu/filemenu.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ui/menu/filemenu.py b/ui/menu/filemenu.py index 882aed85..261c735c 100644 --- a/ui/menu/filemenu.py +++ b/ui/menu/filemenu.py @@ -92,10 +92,7 @@ def __init__(self, filelist, util, playlist_provider, bgr=None, bounding_box=Non selection = url if url and self.filelist: - if playback_mode == FILE_PLAYLIST: - self.filelist.set_current_item(int(url) - 1) - else: - self.filelist.set_current_item_by_url(url) + self.filelist.set_current_item_by_url(url) p_index = self.filelist.current_page_index pl = self.filelist.items @@ -342,7 +339,7 @@ def update_playlist_menu(self, state): name = self.util.get_dictionary_value(state, "Track") if not name: - name = self.util.get_dictionary_value(state, "current_title") + name = self.util.get_dictionary_value(state, "file_name") if name != None: self.config[FILE_PLAYBACK][CURRENT_FILE] = name @@ -573,10 +570,7 @@ def change_folder(self, folder, page_index=0, playlist=None, selected=None): self.filelist = Page(folder_content, self.filelist.rows, self.filelist.columns) if selected: - if self.config[FILE_PLAYBACK][CURRENT_FILE_PLAYBACK_MODE] == FILE_PLAYLIST: - self.filelist.set_current_item(int(selected) - 1) - else: - self.filelist.set_current_item_by_url(selected) + self.filelist.set_current_item_by_url(selected) page_index = self.filelist.current_page_index self.browsing_history[folder] = page_index