From de21e0d81cc1b97d6e1bba8a46932169cd910e20 Mon Sep 17 00:00:00 2001
From: Igor Timofeev <igor@iMac-Igor.local>
Date: Thu, 23 Mar 2017 20:48:52 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?=
 =?UTF-8?q?=D0=BE=D0=B9=20=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Applications.txt                         |  2 +-
 Applications/MineCodeIDE/MineCodeIDE.lua | 59 +++++++++++-------------
 2 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/Applications.txt b/Applications.txt
index cc7e8b36..af23c649 100644
--- a/Applications.txt
+++ b/Applications.txt
@@ -511,7 +511,7 @@
     icon="IgorTimofeev/OpenComputers/master/Applications/MineCodeIDE/Icon.pic",
     createShortcut="dock",
     forceDownload=true,
-    version=1.68,
+    version=1.69,
     resources={
       {
         name="Localization/Russian.lang",
diff --git a/Applications/MineCodeIDE/MineCodeIDE.lua b/Applications/MineCodeIDE/MineCodeIDE.lua
index 8e2eb82f..63d69399 100755
--- a/Applications/MineCodeIDE/MineCodeIDE.lua
+++ b/Applications/MineCodeIDE/MineCodeIDE.lua
@@ -455,29 +455,30 @@ local function clearBreakpoints()
 end
 
 local function addBreakpoint()
-	if mainWindow.errorContainer.isHidden then
-		breakpointLines = breakpointLines or {}
-		local lineExists
-		for i = 1, #breakpointLines do
-			if breakpointLines[i] == cursor.position.line then
-				lineExists = i
-				break
-			end
+	hideErrorContainer()
+	breakpointLines = breakpointLines or {}
+	
+	local lineExists
+	for i = 1, #breakpointLines do
+		if breakpointLines[i] == cursor.position.line then
+			lineExists = i
+			break
 		end
-
-		if lineExists then
-			table.remove(breakpointLines, lineExists)
-		else
-			table.insert(breakpointLines, cursor.position.line)
-		end
-
-		if #breakpointLines > 0 then
-			table.sort(breakpointLines, function(a, b) return a < b end)
-		else
-			breakpointLines = nil
-		end
-		updateHighlights()
 	end
+	
+	if lineExists then
+		table.remove(breakpointLines, lineExists)
+	else
+		table.insert(breakpointLines, cursor.position.line)
+	end
+
+	if #breakpointLines > 0 then
+		table.sort(breakpointLines, function(a, b) return a < b end)
+	else
+		breakpointLines = nil
+	end
+
+	updateHighlights()
 end
 
 local function fixFromLineByCursorPosition()
@@ -526,15 +527,6 @@ local function setCursorPositionAndClearSelection(symbol, line)
 	clearSelection()
 end
 
-local function isClickedOnCodeArea(x, y)
-	return
-		x >= mainWindow.codeView.codeAreaPosition + 1 and
-		y >= mainWindow.codeView.y and
-		x <= mainWindow.codeView.codeAreaPosition + mainWindow.codeView.codeAreaWidth - 2 and
-		y <= mainWindow.codeView.y + mainWindow.codeView.height - 2 and
-		(mainWindow.errorContainer.isHidden or not mainWindow.errorContainer:isClicked(x, y))
-end
-
 local function moveCursor(symbolOffset, lineOffset)
 	if mainWindow.autocompleteWindow.isHidden or lineOffset == 0 then
 		if mainWindow.codeView.selections[1] then
@@ -1792,7 +1784,12 @@ local function createWindow()
 		mainWindow:draw()
 		if cursor.blinkState and mainWindow.settingsContainer.isHidden then
 			local x, y = convertTextPositionToScreenCoordinates(cursor.position.symbol, cursor.position.line)
-			if isClickedOnCodeArea(x, y) then
+			if
+				x >= mainWindow.codeView.codeAreaPosition + 1 and
+				y >= mainWindow.codeView.y and
+				x <= mainWindow.codeView.codeAreaPosition + mainWindow.codeView.codeAreaWidth - 2 and
+				y <= mainWindow.codeView.y + mainWindow.codeView.height - 2
+			then
 				buffer.text(x, y, config.cursorColor, config.cursorSymbol)
 			end
 		end