From a977542319be46215c6b0109ef70eb2b05238f02 Mon Sep 17 00:00:00 2001
From: TIny_Hacker <thetiniesthacker@gmail.com>
Date: Tue, 20 Dec 2022 20:18:23 -0500
Subject: [PATCH] Fix memory leak and minor changes

Co-Authored-By: RoccoLox Programs <roccoloxprograms2018@gmail.com>
---
 .gitignore             |   1 +
 README.md              |   3 +--
 icon.png               | Bin 255 -> 0 bytes
 makefile               |   3 +--
 src/asm/runProgram.asm |  24 +++++++++++++-----------
 src/main.c             |   8 +++++---
 src/utility.c          |   2 ++
 7 files changed, 23 insertions(+), 18 deletions(-)
 delete mode 100644 icon.png

diff --git a/.gitignore b/.gitignore
index d14b101..90fd44b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ src/gfx/*.h
 .DS_Store
 convimg.out
 nul.d
+src/gfx/convimg.yaml.lst
diff --git a/README.md b/README.md
index 26c9b66..bf5047a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-# CEaShell [![Discord Chat Link](https://img.shields.io/discord/1012426214226530424?logo=discord)](https://discord.gg/RDTtu258fW) [![Current Beta](https://img.shields.io/badge/beta-v0.75.1-blue)](https://cdn.discordapp.com/attachments/1014235873161781328/1035331209955397642/CEaShell.zip)
-[//]: <> (Yes I know the beta is only on discord maybe we'll put it on GitHub eventually. Congrats if you can see this, it's supposed to be a secret!🤫)
+# CEaShell [![Discord Chat Link](https://img.shields.io/discord/1012426214226530424?logo=discord)](https://discord.gg/RDTtu258fW) [![Current Beta](https://img.shields.io/badge/beta-v0.82.5-blue)](https://github.com/roccoloxprograms/shell/releases/latest)
 
 CEaShell (pronounced like "Seashell") is a new shell for the TI-84 Plus CE. It aims to provide a modern, sleek, and easy to use UI, which is understandable by any user regardless of previous experience or calculator-related knowledge. To get help, suggest a feature, or report a bug, join the discord!
 
diff --git a/icon.png b/icon.png
deleted file mode 100644
index ac3ad11751512385e94b31f27daa92edb3c05617..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 255
zcmV<b0094qP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002QNkl<ZI8UvU
zK@P((2n6AI&Mm$733*MP(0hAJo=3GvYhgm8RIM+uVs^l=Rx>mCVQB_T(@pmMRU%uP
zW!s*^SqDTRgVy!o!OL>@FJiDF$N>~Xi2WIWF@!ikRR<BSkV^#^qF4>ur>)JF1t^_?
zym0<Upo)lrTxI<<9EzcF0Ln#%E0A~<>^lJ2s?u{6G3EgH)=v(ons^1&n;3lnVIE(G
zWit&{uG~mK<wBet-U3XO#~R0$-`@WoQ`I<@eb$#Zf3Li${o1$300000NkvXXu0mjf
F008FVXsQ4J

diff --git a/makefile b/makefile
index 41a7617..098ead1 100644
--- a/makefile
+++ b/makefile
@@ -10,8 +10,7 @@
 NAME = CEaShell
 APP_NAME = CEaShell
 APP_VERSION = 5.0.0.0000
-CEASHELL_VERSION = 0.82
-ICON = icon.png
+CEASHELL_VERSION = 0.82.5
 DESCRIPTION = (C)  2022  RoccoLox  +  TIny_Hacker
 COMPRESSED = NO
 ARCHIVED = YES
diff --git a/src/asm/runProgram.asm b/src/asm/runProgram.asm
index 1c8eb4e..9537d9d 100644
--- a/src/asm/runProgram.asm
+++ b/src/asm/runProgram.asm
@@ -146,8 +146,6 @@ _asmProgram.run:
     call ti.DisableAPD
 	set	ti.appAutoScroll, (iy + ti.appFlags)
     call execute_setup_vectors
-	;call _clearUsedMem
-	;call ti.DrawStatusBar
     call ti.userMem
     jp _return
 
@@ -312,7 +310,6 @@ _basicProgram:
 	set	ti.progExecuting, (iy + ti.newDispF)
 	set	ti.cmdExec, (iy + ti.cmdFlags)
 	set	ti.allowProgTokens, (iy + ti.newDispF)
-	call _clearUsedMem
 	call execute_setup_vectors
 	call ti.EnableAPD
 	ei
@@ -365,6 +362,7 @@ _return:
 	call _showError
 
 .quit:
+	call ti.ReloadAppEntryVecs
 	call ti.DeleteTempPrograms
 	call ti.CleanAll
     ld de, (ti.asm_prgm_size)
@@ -373,9 +371,14 @@ _return:
     ld (ti.asm_prgm_size), hl
     ld hl, ti.userMem
     call ti.DelMem
-    ld a, (returnCEaShell)
+    bit ti.monAbandon, (iy + ti.monFlags)
+	jr nz, .quitNoApp
+	ld a, (returnCEaShell)
 	cp a, 1
 	jp z, _reloadApp
+
+.quitNoApp:
+	res	ti.onInterrupt, (iy + ti.onFlags)
 	call ti.ClrTxtShd
 	ld a, ti.cxCmd
 	call ti.NewContext0
@@ -496,7 +499,7 @@ execute_setup_vectors:
 execute_vectors:
 	dl	.ret
 	dl	ti.SaveShadow
-	dl	.putway
+	dl	.putaway
 	dl	.restore
 	dl	.ret
 	dl	.ret
@@ -506,7 +509,7 @@ execute_vectors:
 	jp	ti.RStrShadow
 .ret:
 	ret
-.putway:
+.putaway:
 	xor	a,a
 	ld	(ti.currLastEntry),a
 	bit	appInpPrmptInit,(iy + ti.apiFlg2)
@@ -687,11 +690,11 @@ _reloadApp:
 	jp (hl)
 
 execute_hook:
-	add	a,e
+	db $83
 	cp	a,3
 	ret	nz
-	call _reinstallGetCSCHook
 	ld iy, ti.flags
+	call _reinstallGetCSCHook
 	call ti.ClrHomescreenHook
 	ld hl, appVarName ; restore other homescreen hook if need be
 	call ti.Mov9ToOP1
@@ -712,13 +715,12 @@ execute_hook:
 	add hl, de
 	ld a, 1
 	cp a, (hl)
-	jr nz, .continue
-	call _installHomescreenHook
+	call z, _installHomescreenHook
 
 .continue:
 	bit	appInpPrmptDone,(iy + ti.apiFlg2)
 	res	appInpPrmptDone,(iy + ti.apiFlg2)
-	jp	z, _reloadApp
+	jp	z, _return.quit
 	call	ti.ReloadAppEntryVecs
 	ld	hl,execute_vectors
 	call	ti.AppInit
diff --git a/src/main.c b/src/main.c
index 9557838..b49ae5c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -5,8 +5,8 @@
  * By RoccoLox Programs and TIny_Hacker
  * Copyright 2022
  * License: GPL-3.0
- * Last Build: December 19, 2022
- * Version: 0.82
+ * Last Build: December 20, 2022
+ * Version: 0.82.5
  * 
  * --------------------------------------
 **/
@@ -15,10 +15,10 @@
 #include "shapes.h"
 #include "menu.h"
 #include "utility.h"
+#include "gfx/gfx.h"
 #include "asm/misc.h"
 #include "asm/sortVat.h"
 #include "asm/fileOps.h"
-#include "gfx/gfx.h"
 #include "asm/hooks.h"
 #include "asm/lowercase.h"
 #include "asm/runProgram.h"
@@ -588,6 +588,7 @@ int main(void) {
 
                         gfx_End();
                         util_WritePrefs(colors, transitionSpeed, is24Hour, displayCEaShell, getCSCHook, editArchivedProg, editLockedProg, showHiddenProg, showFileCount, hideBusyIndicator, lowercase, apdTimer, fileSelected, fileStartLoc, directory, showApps, showAppvars, &programPtrs, &appvarPtrs, fileNumbers, true);   // Stores our data to the appvar before exiting
+                        kb_DisableOnLatch();
                         editBasicProg(name, OS_TYPE_PRGM);
                     } else if (directory == APPVARS_FOLDER) {
                         if (!util_CheckNameExists(name, directory)) {
@@ -599,6 +600,7 @@ int main(void) {
 
                         gfx_End();
                         util_WritePrefs(colors, transitionSpeed, is24Hour, displayCEaShell, getCSCHook, editArchivedProg, editLockedProg, showHiddenProg, showFileCount, hideBusyIndicator, lowercase, apdTimer, fileSelected, fileStartLoc, directory, showApps, showAppvars, &programPtrs, &appvarPtrs, fileNumbers, true);   // Stores our data to the appvar before exiting
+                        kb_DisableOnLatch();
                         editCelticAppvar(name);
                     }
                 } else if (!copyMenu) { // Copy
diff --git a/src/utility.c b/src/utility.c
index 9ff3138..66b5f35 100644
--- a/src/utility.c
+++ b/src/utility.c
@@ -215,6 +215,7 @@ void util_PrintFreeRamRom(void) {
 
 void util_RunPrgm(unsigned int fileSelected, unsigned int fileStartLoc, void **programPtrs, const bool editLockedProg, const bool showApps, const bool showAppvars) {
     gfx_End();
+    kb_DisableOnLatch();
     uint8_t fileType; // Different from C, ICE, ASM, etc. This is stuff like OS_TYPE_APPVAR and OS_TYPE_PRGM
     unsigned int filesSearched = showApps + showAppvars; // Account for folders
 
@@ -419,6 +420,7 @@ uint8_t util_GetSingleKeyPress(void) {
 
 void util_RunApp(const unsigned int fileSelected, const bool displayCEaShell) {
     while (kb_AnyKey());
+    kb_DisableOnLatch();
 
     unsigned int filesSearched = 1; // account for folders
     char appName[9] = "\0";