Mercurial > repos > blastem

changeset 2409:f8ce89498e11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix some further fallout of ZIP reload fix
author Michael Pavone <pavone@retrodev.com>
date Wed, 03 Jan 2024 19:45:23 -0800
parents 130106f5c87a
children f1574b22d5d9
files bindings.c nuklear_ui/blastem_nuklear.c
diffstat 2 files changed, 1 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/bindings.c	Wed Jan 03 19:40:57 2024 -0800
+++ b/bindings.c	Wed Jan 03 19:45:23 2024 -0800
@@ -390,20 +390,7 @@
 			break;
 		case UI_RELOAD:
 			if (allow_content_binds) {
-				system_media *lock = current_media()->chain;
-				if (lock) {
-					const char* parts[] = {lock->dir, PATH_SEP, lock->name, ".", lock->extension};
-					char const **start = parts[0] ? parts : parts + 2;
-					int num_parts = parts[0] ? 5 : 3;
-					if (!parts[4]) {
-						num_parts -= 2;
-					}
-					char *path = alloc_concat_m(num_parts, start);
-					lockon_media(path);
-					free(path);
-				} else {
-					reload_media();
-				}
+				reload_media();
 			}
 			break;
 		case UI_SMS_PAUSE:
--- a/nuklear_ui/blastem_nuklear.c	Wed Jan 03 19:40:57 2024 -0800
+++ b/nuklear_ui/blastem_nuklear.c	Wed Jan 03 19:45:23 2024 -0800
@@ -126,7 +126,6 @@
 		pop_view();
 	} else {
 		lockon_media(full_path);
-		free(full_path);
 
 		clear_view_stack();
 		show_play_view();