From 1aa15566bfc6b10e8d3f97bdf8445109274f3320 Mon Sep 17 00:00:00 2001
From: Anatoliy Belyanskiy <tolik.trek@gmail.com>
Date: Wed, 25 Oct 2023 01:38:14 +1000
Subject: [PATCH] =?UTF-8?q?-=20bug=20=D1=81=20=D0=B2=D1=8B=D1=85=D0=BE?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BC=20=D0=B8=D0=B7=20=D0=BF=D1=80=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F,=20=D0=BD=D0=B5=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=80=D1=8B=D0=B2=D0=B0=D0=BB=D1=81=D1=8F=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BC=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=BF=D1=83=D0=BB=D1=8F=D1=82=D0=BE=D1=80.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DSS/DOS5.ASM    |  5 ++---
 DSS/EXECUTE.ASM | 11 ++++++++++-
 DSS/build.txt   |  2 +-
 Shared_Includes |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/DSS/DOS5.ASM b/DSS/DOS5.ASM
index 9d9f180..87656a3 100644
--- a/DSS/DOS5.ASM
+++ b/DSS/DOS5.ASM
@@ -2097,7 +2097,6 @@ DIR_PATH_CHECK:	LD	A,(HL)
 		;
 .forceCheck:	LD	HL,CurrentDirectory+1
 		LD	BC,CurrentDirectory.DEPTH-1
-		;CALL	FINDDIR.CHECK_SLASH
 		CALL	.checkDrive
 		JR	Z,.checkDir
 		;
@@ -2105,7 +2104,7 @@ DIR_PATH_CHECK:	LD	A,(HL)
 		LD	A,(FatBuffer.DRIVE)
 		ADD	'A'
 		CP	(HL)
-		JP	NZ,.gotoPath
+		JR	NZ,.gotoPath
 		;
 .checkDir:	LD	HL,CurrentDirectory+1
 		LD	DE,WorkDirectory+1
@@ -2122,7 +2121,7 @@ DIR_PATH_CHECK:	LD	A,(HL)
 .end:		CP	(HL)
 		RET	Z
 .ReDir:		LD	HL,CurrentPath
-		JP	.gotoPath
+		JR	.gotoPath
 		;
 .checkDrive:	LD	HL,CurrentPath
 		LD	A,(FatBuffer.DRIVE)
diff --git a/DSS/EXECUTE.ASM b/DSS/EXECUTE.ASM
index 07604fe..d8d42fe 100644
--- a/DSS/EXECUTE.ASM
+++ b/DSS/EXECUTE.ASM
@@ -1046,6 +1046,10 @@ _TST_PROC:
 	IN	A,(SLOT1)
 	PUSH	DE
 	PUSH	AF
+	;!Test close EXE FM [x] 25/10/23
+	 LD	A,(EXE_FM)
+	 PUSH	AF
+	;
 	LD	(EXSTACK),SP
 	LD	SP,HL
 	EXX 
@@ -1154,8 +1158,13 @@ _TST_PROC_2:
 LEAVE:	LD	A,B
 	LD	(ERLEVEL),A
 	CALL	LEAVMEM
-	CALL	DECTASK
+	;CALL	DECTASK		;!Test close EXE FM [x] 25/10/23
 	LD	SP,(EXSTACK)
+	;!Test close EXE FM [x] 25/10/23
+	 POP	AF
+	 CALL	RES_FM
+	 CALL	DECTASK
+	; 
 	POP	AF
 	POP	HL
 	OUT	(SLOT1),A
diff --git a/DSS/build.txt b/DSS/build.txt
index 5f5c389..9889789 100644
--- a/DSS/build.txt
+++ b/DSS/build.txt
@@ -1 +1 @@
-496
\ No newline at end of file
+499
\ No newline at end of file
diff --git a/Shared_Includes b/Shared_Includes
index 12ce194..9319bb7 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit 12ce1947adb0a8d902cd6d89042fe23cb9a33c21
+Subproject commit 9319bb78d96af2573dd54d8d2f422f2f134b5653