From b88e1b43334564ea2f593c1002b3dc91b85553f3 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Fri, 3 Jun 2016 09:07:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D1=82,=20=D0=B7=D0=BD=D0=B0=D1=87?=
 =?UTF-8?q?=D0=B8=D1=82,=20=D0=BA=D0=B0=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Applications.txt        | 1 -
 Installer/Installer.lua | 4 +++-
 MineOS/OS.lua           | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Applications.txt b/Applications.txt
index fc2a4311..16821ccf 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -668,7 +668,6 @@
     ["type"]="Application",
     ["icon"]="IgorTimofeev/OpenComputers/master/Applications/Calendar/Icon.pic",
     ["createShortcut"]="dock",
-    ["forceDownload"]=true,
     ["version"]=1.0,
   },
   {
diff --git a/Installer/Installer.lua b/Installer/Installer.lua
index d580fd4e..742e4c90 100644
--- a/Installer/Installer.lua
+++ b/Installer/Installer.lua
@@ -143,10 +143,12 @@ applications = seri.unserialize(getFromGitHubSafely(GitHubUserUrl .. "IgorTimofe
 print(" ")
 
 for i = 1, #preLoadApi do
-  print("Downloading must-have files (" .. fs.name(preLoadApi[i].path) .. ")")
+  print("Downloading \"" .. fs.name(preLoadApi[i].path) .. "\"")
   getFromGitHubSafely(GitHubUserUrl .. preLoadApi[i].paste, preLoadApi[i].path)
 end
 
+print(" ")
+print("Initialization stage is complete, loading installer")
 print(" ")
 
 package.loaded.ecs = nil
diff --git a/MineOS/OS.lua b/MineOS/OS.lua
index 941d262a..a4684c31 100644
--- a/MineOS/OS.lua
+++ b/MineOS/OS.lua
@@ -460,10 +460,10 @@ while true do
 					MineOSCore.drawIcon(icon.x, icon.y, pathOfDockShortcuts .. icon.path, false, 0xffffff)
 					buffer.draw()
 
+					local fileFormat = ecs.getFileFormat(icon.path)
 					if eventData[5] == 0 then
-						os.sleep(0.2)
-						MineOSCore.launchIcon(pathOfDockShortcuts .. icon.path)
-						drawAll(true)
+						icon.path = pathOfDockShortcuts .. icon.path
+						MineOSCore.iconLeftClick(icon, oldPixelsOfIcon, fileFormat, {method = getFileListAndDrawAll, arguments = {}}, {method = getFileListAndDrawAll, arguments = {true}}, {method = function() MineOSCore.safeLaunch("Finder.lua", "open", icon.path) end, arguments = {icon.path}})
 					else
 						local content = ecs.readShortcut(pathOfDockShortcuts .. icon.path)
 						action = context.menu(eventData[3], eventData[4], {MineOSCore.localization.contextMenuRemoveFromDock, not (currentCountOfIconsInDock > 1)})