Fix loop when running SUBMIT and autoexec together

pzembrod · May 7, 2024 · 3771101 · 3771101
1 parent 094b66a
commit 3771101
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/RunCPM/ccp.h b/RunCPM/ccp.h
@@ -688,10 +688,10 @@ void _ccp(void) {
     for (i = 0; i < 36; ++i) {
         _RamWrite(BatchFCB + i, _RamRead(tmpFCB + i));
     }
-   
+
 	// Loads an autoexec file if it exists and this is the first boot
 	// The file contents are loaded at ccpAddr+8 up to 126 bytes then the size loaded is stored at ccpAddr+7
-	if (firstBoot) {
+	if (firstBoot && !sFlag) {
        	uint8 dmabuf[128];
        	uint16 cmd = inBuf + 1;
 		if (_sys_exists((uint8*)AUTOEXEC)) {
@@ -718,7 +718,7 @@ void _ccp(void) {
         _RamWrite(inBuf + 1, 0);                    // Clears the buffer
         blen = 0;
     }
-       
+
     while (TRUE) {
         curDrive = (uint8)_ccp_bdos(DRV_GET, 0x0000);   // Get current drive
         curUser = (uint8)_ccp_bdos(F_USERNUM, 0x00FF);  // Get current user

diff --git a/RunCPM/main.c b/RunCPM/main.c
@@ -99,7 +99,7 @@ int main(int argc, char* argv[]) {
 
 		// Loads an autoexec file if it exists and this is the first boot
 		// The file contents are loaded at ccpAddr+8 up to 126 bytes then the size loaded is stored at ccpAddr+7
-		if (firstBoot) {
+		if (firstBoot an not sFlag) {
 			uint8 dmabuf[128];
 			uint8 bytesread;
 			uint16 cmd = CCPaddr + 7;
@@ -123,6 +123,7 @@ int main(int argc, char* argv[]) {
 			if (BOOTONLY)
 				firstBoot = FALSE;
 		}
+
 		Z80reset();			// Resets the Z80 CPU
 		SET_LOW_REGISTER(BC, _RamRead(DSKByte));	// Sets C to the current drive/user
 		PC = CCPaddr;		// Sets CP/M application jump point