Skip to content

Commit effee48

Browse files
MrServoHains
authored andcommitted
[LCD4linux] V5.0-r32 bugfix: duplicate call removed (#920)
* [LCD4linux] V5.0-r32 bugfix: duplicate call removed and improvement - bugfix: duplicate call 'onSelectionChanged.append()' removed (braked the box down) - bugfix: duplicate call 'onSelectionChanged.append()' removed (braked the box down) - improvement: Otherwise you cannot get away from the top directory level (list of data carriers) in the file browser. THX to User **KenTucky @ OpenA.TV** details see: https://www.opena.tv/viewtopic.php?p=590262&sid=f13c41d9b4a82dd82d27537ca5f77da1#p590262 HINT: **LCD4linux** is still working under Python2 and Python3
1 parent 642f0e5 commit effee48

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

lcd4linux/src/myFileList.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,13 @@ def canDescent(self):
208208

209209
def descent(self):
210210
if self.getSelection() != "":
211+
<<<<<<< HEAD:lcd4linux/src/myFileList.py
211212
se = (self.current_directory if self.current_directory.endswith("/") else os_path.basename(self.current_directory)) if self.current_directory is not None else ""
213+
=======
214+
se = ""
215+
if self.current_directory is not None:
216+
se = self.current_directory if self.current_directory.endswith("/") else os_path.basename(self.current_directory)
217+
>>>>>>> e8afd925 ([LCD4linux] V5.0-r32 bugfix: duplicate call removed (#920)):LCD4linux/src/myFileList.py
212218
self.changeDir(self.getSelection()[0], select=se)
213219

214220
def getFilename(self):

lcd4linux/src/plugin.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
if find_library("usb-0.1") is not None or find_library("usb-1.0") is not None:
173173
print("[LCD4linux] libusb found :-)", getEnigmaVersionString())
174174
USBok = True
175-
Version = "V5.0-r31"
175+
Version = "V5.0-r32"
176176
L4LElist = L4Lelement()
177177
L4LdoThread = True
178178
LCD4enigma2config = resolveFilename(SCOPE_CONFIG) # /etc/enigma2/
@@ -5555,8 +5555,6 @@ def __init__(self, session, args=0):
55555555
self.mode = _("Global")
55565556
self.LastSelect = "4"
55575557
self.SetList()
5558-
if self.selectionChanged not in self["config"].onSelectionChanged:
5559-
self["config"].onSelectionChanged.append(self.selectionChanged)
55605558
if LCD4linux.LCDType3.value == "00":
55615559
self["LCD3"].hide()
55625560
if getDesktop(0).size().width() < 1000:

0 commit comments

Comments
 (0)