From cb88e960334275c7980a6e8c314f47ca4830695c Mon Sep 17 00:00:00 2001
From: Igor Timofeev <Igor@iMac-Igor.local>
Date: Mon, 9 Jan 2017 23:51:01 +0300
Subject: [PATCH] aefaefaef

---
 .DS_Store          | Bin 18436 -> 18436 bytes
 Applications.txt   |   4 ++--
 MineOS/OS.lua      |   1 +
 lib/MineOSCore.lua |  12 +++++++++++-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 3329ead79afd4a63d411ef867257504ba248d2cd..28f294a746f3a0bbc5db91965975e0480e802614 100644
GIT binary patch
delta 582
zcmXYtOK1~89LD!&t!`kTleEQVrNpF|92#O36-?EnTC}w-il!P#6=HUyY15=M@l}Oh
zq8JZaUBn7r6j4EZ5vm@GUc_^+o;-W>BKVlyWDW!0eDi;NzuFSDCEo3oblUr5!_IDv
zEv|VyYaP<->+u_6%FI@+iLzP97c5h*=uM~BZx|WJIXG{r+thWpAQ&=4s!~|6WVZD&
z91$WlQz)6T(rVft6~<&Sd(J9K)6*;)*e;Aym#q0pp<I$<p3&y(uHC{&=gPCQR;gO?
z5^a5s4;sc<XY_csQaw6nmDE~aTk{iYt<#P-WSY)W_T8>tyUo{^`>y@aermt8-`XGT
zul5g}ZZ^?_pAa#&F~A=7lVpekjB$+PoFK&+a#-X!&m31+;2PJt!5!{#ADhR#;x%u0
z%O^hb#jg9(8v`SwM>@o?osduLdgrtqY!5FgikpKWA*ANTA?xUHBoL766i(fh{n3Ds
zZ7wv&RXhT+-NoZb1wzR6E<i`d2bH@)acb5klB$*NB5>T{h-!uI(fg9QEt)#^a@XNZ
zjGZdqAx2cXaV9uPnhaAaVV(<2GeeP!T;{5qvc^qrQRlWw`GAKk^N6QB<2f&Q$$J{C
Q@PUu4I=LJ1?r%H(1Hm1O*Z=?k

delta 465
zcmXYtJ4_T&7)Iv=jQ56{?A-+kJ7Tk}h>;jjLXbcdi&a6?Vi5#24$MFX_Myy5e3k2C
zZ6vuyW1<l?8aqWKJ}R{|mQ+^O_L^v;!z}IppD*XjS6-yN$m>2$qv_WxwW>iins0Vf
z*SPO`g_1w*d-F2Rn#>lQytfw9@q|j+TcutVr(LJy4Hw;Y#*IE^d3*g#grw}W)Q-po
z{*{f;4z*M2KxXIsLKU{#)o!6(Ig)cGy<C*HJJnvHhvevjHy`-LLiO0KdPJOdIW|?y
z=fh4x)wQd&S=&i_K!{W8MFw2gbIqNGZKfvCGWFg1Vg0mzS--76)?e!%0!bZ;Bq>@*
z)4@J^>7$>63~`iW94E^e&T<Zi8P0QofD+fZ&J8Nu#_*6wJZ6bkyypWSO(ik5x%u#s
z!I;XJ{rZWi)X$o^w$@lvxQ|MybTpf`%u?Irri>Jtu-%D?4!Su&hC>X7=3!1U$~Y6D
zdph*`%#!0G3tZwdS1E`7o7{^0ce%%X9`KZBJm&>3S>_FIS>+v{_{^7;-YsAE{0CS;
Bb`byo

diff --git a/Applications.txt b/Applications.txt
index a1c20aa2..2bd0e735 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -8,7 +8,7 @@
     about="IgorTimofeev/OpenComputers/master/MineOS/About/",
     type="Script",
     forceDownload=true,
-    version=3.40,
+    version=3.41,
   },
   {
     name="MineOS/Pictures/Raspberry.pic",
@@ -253,7 +253,7 @@
     name="lib/MineOSCore.lua",
     url="IgorTimofeev/OpenComputers/master/lib/MineOSCore.lua",
     type="Library",
-    version=1.35,
+    version=1.36,
   },
   {
     name="lib/advancedLua.lua",
diff --git a/MineOS/OS.lua b/MineOS/OS.lua
index a9f04f8c..19995a9f 100755
--- a/MineOS/OS.lua
+++ b/MineOS/OS.lua
@@ -387,6 +387,7 @@ local function updateDock()
 				for file in fs.list(MineOSCore.paths.trash) do
 					fs.remove(MineOSCore.paths.trash .. file)
 				end
+				workspace.updateFileList()
 			end
 		end
 		menu:show()
diff --git a/lib/MineOSCore.lua b/lib/MineOSCore.lua
index aa796eca..b0ecc1eb 100755
--- a/lib/MineOSCore.lua
+++ b/lib/MineOSCore.lua
@@ -743,7 +743,17 @@ function MineOSCore.iconRightClick(icon, eventData)
 		_G.clipboardCut = true
 		computer.pushSignal("MineOSCore", "updateFileList")
 	elseif action == MineOSCore.localization.contextMenuDelete then
-		fs.rename(icon.path, MineOSCore.paths.trash .. fs.name(icon.path))
+		if fs.path(icon.path) == MineOSCore.paths.trash then
+			fs.remove(icon.path)
+		else
+			local newName = MineOSCore.paths.trash .. fs.name(icon.path)
+			local clearName = MineOSCore.hideFileFormat(fs.name(icon.path))
+			local repeats = 1
+			while fs.exists(newName) do
+				newName, repeats = MineOSCore.paths.trash .. clearName .. string.rep("-copy", repeats) .. icon.format, repeats + 1
+			end
+			fs.rename(icon.path, newName)
+		end
 		computer.pushSignal("MineOSCore", "updateFileList")
 	elseif action == MineOSCore.localization.contextMenuRename then
 		ecs.rename(icon.path)