Disk Op. bugfix for "ask dialogs"

- Disk Op.: Fixed a bug from v1.54 where sequential ask dialogs resulted in an empty file list inbetween the two dialogs
8bitbubsy · Dec 9, 2022 · dff7f1d · dff7f1d
1 parent 871c59c
commit dff7f1d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 15 deletions.
diff --git a/src/pt2_askbox.c b/src/pt2_askbox.c
@@ -96,16 +96,18 @@ void removeAskBox(void)
 
 	if (ui.diskOpScreenShown)
 	{
-		renderDiskOpScreen();
+		renderDiskOpScreen(); // also sets update flags
+		updateDiskOp(); // redraw requested updates
 	}
 	else if (ui.posEdScreenShown)
 	{
-		renderPosEdScreen();
-		ui.updatePosEd = true;
+		renderPosEdScreen(); // also sets update flags
+		updatePosEd(); // redraw requested updates
 	}
 	else if (ui.editOpScreenShown)
 	{
-		renderEditOpScreen();
+		renderEditOpScreen(); // also sets update flags
+		updateEditOp(); // redraw requested updates
 	}
 	else if (ui.aboutScreenShown)
 	{

diff --git a/src/pt2_header.h b/src/pt2_header.h
@@ -14,7 +14,7 @@
 #include "pt2_unicode.h"
 #include "pt2_palette.h"
 
-#define PROG_VER_STR "1.54"
+#define PROG_VER_STR "1.55"
 
 #ifdef _WIN32
 #define DIR_DELIMITER '\\'

diff --git a/src/pt2_mouse.c b/src/pt2_mouse.c
@@ -3548,17 +3548,26 @@ static bool handleGUIButtons(int32_t button) // are you prepared to enter the ju
 
 		case PTB_DO_SAVESAMPLE:
 		{
-			if (diskop.mode != DISKOP_MODE_SMP)
+			bool changeLoadMode = (diskop.mode != DISKOP_MODE_SMP);
+			if (changeLoadMode)
 			{
 				diskop.mode = DISKOP_MODE_SMP;
 				setPathFromDiskOpMode();
-				diskop.scrollOffset = 0;
-				diskop.cached = false;
-				ui.updateLoadMode = true;
+				ui.updateLoadMode = true; // redraw load mode cursor
+				updateDiskOp();
 			}
 
 			if (askBox(ASKBOX_YES_NO, "SAVE SAMPLE ?"))
-				saveSample(CHECK_IF_FILE_EXIST, DONT_GIVE_NEW_FILENAME);
+				saveSample(CHECK_IF_FILE_EXIST, DONT_GIVE_NEW_FILENAME); // also updates file list
+
+			// if we changed mode, re-read directory in Disk Op.
+			if (changeLoadMode)
+			{
+				diskop.scrollOffset = 0;
+				diskop.cached = false; // read new directory
+				ui.updateDiskOpFileList = true;
+				updateDiskOp();
+			}
 		}
 		break;
 
@@ -3758,17 +3767,26 @@ static bool handleGUIButtons(int32_t button) // are you prepared to enter the ju
 
 		case PTB_DO_SAVEMODULE:
 		{
-			if (diskop.mode != DISKOP_MODE_MOD)
+			bool changeLoadMode = (diskop.mode != DISKOP_MODE_MOD);
+			if (changeLoadMode)
 			{
 				diskop.mode = DISKOP_MODE_MOD;
 				setPathFromDiskOpMode();
-				diskop.scrollOffset = 0;
-				diskop.cached = false;
-				ui.updateLoadMode = true;
+				ui.updateLoadMode = true; // redraw load mode cursor
+				updateDiskOp();
 			}
 
 			if (askBox(ASKBOX_YES_NO, "SAVE MODULE ?"))
-				saveModule(CHECK_IF_FILE_EXIST, DONT_GIVE_NEW_FILENAME);
+				saveModule(CHECK_IF_FILE_EXIST, DONT_GIVE_NEW_FILENAME); // also updates file list
+
+			// if we changed mode, re-read directory in Disk Op.
+			if (changeLoadMode)
+			{
+				diskop.scrollOffset = 0;
+				diskop.cached = false; // read new directory
+				ui.updateDiskOpFileList = true;
+				updateDiskOp();
+			}
 		}
 		break;
 

diff --git a/src/pt2_visuals.c b/src/pt2_visuals.c
@@ -860,6 +860,7 @@ void updatePosEd(void)
 void renderPosEdScreen(void)
 {
 	blit32(120, 0, 200, 99, posEdBMP);
+	ui.updatePosEd = true;
 }
 
 void renderMuteButtons(void)