From 150ad5ad15541c1791b3fe6cfbb535abddceb115 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <igor@iMac-Igor.local>
Date: Sat, 23 Sep 2017 00:01:29 +0300
Subject: [PATCH] =?UTF-8?q?=D0=91=D0=B0=D0=B3=D1=84=D0=B8=D0=BA=D1=81?=
 =?UTF-8?q?=D1=8B=20FTP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Applications.cfg             | 6 +++---
 Applications/Finder/Main.lua | 8 +++++---
 MineOS/OS.lua                | 1 -
 lib/MineOSCore.lua           | 6 ++----
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Applications.cfg b/Applications.cfg
index 09a04ed0..e793e2cf 100644
--- a/Applications.cfg
+++ b/Applications.cfg
@@ -5,7 +5,7 @@
 		about="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/MineOS/About/",
 		type="Script",
 		forceDownload=true,
-		version=3.85,
+		version=3.86,
 	},
 	{
 		path="/MineOS/Pictures/MoonTouch.pic",
@@ -223,7 +223,7 @@
 		path="/lib/MineOSCore.lua",
 		url="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
 		type="Library",
-		version=1.86,
+		version=1.87,
 	},
 	{
 		path="/lib/MineOSNetwork.lua",
@@ -488,7 +488,7 @@
 		icon="https://raw.githubusercontent.com/IgorTimofeev/OpenComputers/master/Applications/Finder/Icon.pic",
 		createShortcut="dock",
 		forceDownload=true,
-		version=1.19,
+		version=1.20,
 	},
 	{
 		path="/MineOS/Applications/3DTest",
diff --git a/Applications/Finder/Main.lua b/Applications/Finder/Main.lua
index cdc02189..308b5e71 100644
--- a/Applications/Finder/Main.lua
+++ b/Applications/Finder/Main.lua
@@ -18,7 +18,6 @@ local scrollTimerID
 local favourites = {
 	{text = "Root", path = "/"},
 	{text = "Desktop", path = MineOSCore.paths.desktop},
-	{text = "Downloads", path = MineOSCore.paths.downloads},
 	{text = "Applications", path = MineOSCore.paths.applications},
 	{text = "Pictures", path = MineOSCore.paths.pictures},
 	{text = "System", path = MineOSCore.paths.system},
@@ -111,7 +110,6 @@ end
 local function sidebarItemOnTouch(object, eventData)
 	if eventData[5] == 0 then
 		addWorkpath(object.path)
-		window.iconField.yOffset = 2
 		window.iconField:updateFileList()
 
 		mainContainer:draw()
@@ -175,9 +173,13 @@ window.iconField = window:addChild(
 		MineOSCore.paths.desktop
 	)
 )
+local oldSetWorkPath = window.iconField.setWorkpath
+window.iconField.setWorkpath = function(...)
+	window.iconField.yOffset = 2
+	oldSetWorkPath(...)
+end
 window.iconField.launchers.directory = function(icon)
 	addWorkpath(icon.path)
-	window.iconField:updateFileList()
 	mainContainer:draw()
 	buffer.draw()
 end
diff --git a/MineOS/OS.lua b/MineOS/OS.lua
index 302e7745..9e285960 100755
--- a/MineOS/OS.lua
+++ b/MineOS/OS.lua
@@ -855,7 +855,6 @@ end
 createOSWindow()
 changeResolution()
 changeWallpaper()
-MineOSCore.OSMainContainer.iconField:updateFileList()
 MineOSCore.OSUpdateTimezone()
 MineOSCore.OSUpdateDate()
 login()
diff --git a/lib/MineOSCore.lua b/lib/MineOSCore.lua
index 88855004..cd1b6ef5 100755
--- a/lib/MineOSCore.lua
+++ b/lib/MineOSCore.lua
@@ -304,9 +304,6 @@ end
 
 function MineOSCore.iconLaunchers.directory(icon)
 	icon.parent.parent:setWorkpath(icon.path)
-	icon.parent.parent:updateFileList()
-	icon:getFirstParent():draw()
-	buffer.draw()
 end
 
 function MineOSCore.iconLaunchers.shortcut(icon)
@@ -336,7 +333,7 @@ function MineOSCore.iconLaunchers.showPackageContent(icon)
 end
 
 function MineOSCore.iconLaunchers.showContainingFolder(icon)
-	icon.parent.parent:setWorkpath(icon.shortcutPath)
+	icon.parent.parent:setWorkpath(fs.path(icon.shortcutPath))
 	icon.parent.parent:updateFileList()
 	icon:getFirstParent():draw()
 	buffer.draw()
@@ -417,6 +414,7 @@ local function getCykaIconPosition(iconField)
 end
 
 local function iconFieldUpdateFileList(iconField)
+	-- GUI.error(debug.traceback())
 	iconField.fileList = fs.sortedList(iconField.workpath, MineOSCore.OSSettings.sortingMethod or "type", MineOSCore.OSSettings.showHiddenFiles)
 	iconField:update()