- Don't dispose already-disposed-of loading icon.

- Relocate banner TLUT.
emukidid · Feb 26, 2024 · 78b90d7 · 78b90d7
1 parent 8bc6b11
commit 78b90d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/cube/swiss/source/devices/filemeta.c b/cube/swiss/source/devices/filemeta.c
@@ -419,7 +419,7 @@ static void *meta_thread_func(void *arg) {
 
 void meta_thread_start() {
 	if (devices[DEVICE_CUR]->features & FEAT_THREAD_SAFE)
-		LWP_CreateThread(&meta_thread, meta_thread_func, NULL, NULL, 32*1024, LWP_PRIO_NORMAL);
+		LWP_CreateThread(&meta_thread, meta_thread_func, NULL, NULL, 16*1024, LWP_PRIO_NORMAL);
 }
 
 void meta_thread_stop() {

diff --git a/cube/swiss/source/gui/FrameBufferMagic.c b/cube/swiss/source/gui/FrameBufferMagic.c
@@ -1290,16 +1290,21 @@ uiDrawObj_t* DrawFileBrowserButton(int x1, int y1, int x2, int y2, const char *m
 	eventData->mode = mode;
 	eventData->file = calloc(1, sizeof(file_handle));
 	memcpy(eventData->file, file, sizeof(file_handle));
-	if(file->meta) {
+	if(eventData->file->meta) {
 		eventData->file->meta = calloc(1, sizeof(file_meta));
 		memcpy(eventData->file->meta, file->meta, sizeof(file_meta));
-		if(file->meta->banner) {
+		if(eventData->file->meta->banner) {
 			// Make a copy cause we want this one to be killed off when the display event is disposed
 			eventData->file->meta->banner = memalign(32, eventData->file->meta->bannerSize);
 			memcpy(eventData->file->meta->banner, file->meta->banner, eventData->file->meta->bannerSize);
 			DCFlushRange(eventData->file->meta->banner, eventData->file->meta->bannerSize);
 			GX_InitTexObjData(&eventData->file->meta->bannerTexObj, eventData->file->meta->banner);
 			if(GX_GetTexObjUserData(&eventData->file->meta->bannerTexObj) == &file->meta->bannerTlutObj) {
+				void *img_ptr;
+				u16 wd, ht;
+				u8 fmt, wrap_s, wrap_t, mipmap;
+				GX_GetTexObjAll(&eventData->file->meta->bannerTexObj, &img_ptr, &wd, &ht, &fmt, &wrap_s, &wrap_t, &mipmap);
+				GX_InitTlutObjData(&eventData->file->meta->bannerTlutObj, img_ptr + GX_GetTexBufferSize(wd, ht, fmt, mipmap, 0));
 				GX_InitTexObjUserData(&eventData->file->meta->bannerTexObj, &eventData->file->meta->bannerTlutObj);
 			}
 		}

diff --git a/cube/swiss/source/swiss.c b/cube/swiss/source/swiss.c
@@ -343,9 +343,6 @@ uiDrawObj_t* renderFileBrowser(file_handle** directory, int num_files, uiDrawObj
 	}
 	meta_thread_start();
 	while(1) {
-		if(loadingBox != NULL) {
-			DrawDispose(loadingBox);
-		}
 		loadingBox = DrawProgressLoading(PROGRESS_BOX_BOTTOMLEFT);
 		DrawPublish(loadingBox);
 		uiDrawObj_t *newPanel = DrawContainer();
@@ -576,9 +573,6 @@ uiDrawObj_t* renderFileCarousel(file_handle** directory, int num_files, uiDrawOb
 	}
 	meta_thread_start();
 	while(1) {
-		if(loadingBox != NULL) {
-			DrawDispose(loadingBox);
-		}
 		loadingBox = DrawProgressLoading(PROGRESS_BOX_TOPRIGHT);
 		DrawPublish(loadingBox);
 		uiDrawObj_t *newPanel = DrawContainer();
@@ -751,9 +745,6 @@ uiDrawObj_t* renderFileFullwidth(file_handle** directory, int num_files, uiDrawO
 	}
 	meta_thread_start();
 	while(1) {
-		if(loadingBox != NULL) {
-			DrawDispose(loadingBox);
-		}
 		loadingBox = DrawProgressLoading(PROGRESS_BOX_TOPRIGHT);
 		DrawPublish(loadingBox);
 		uiDrawObj_t *newPanel = DrawContainer();