# HG changeset patch
# User Michael Pavone <pavone@retrodev.com>
# Date 1511334671 28800
# Node ID afa3fbb76bffb302c750849f73a53b52f3afd3a8
# Parent  c5c022c7aa5414a75a192c220d11e8d50a953622
Basic support for loading ROMs via Nuklear UI

diff -r c5c022c7aa54 -r afa3fbb76bff m68k_core.c
--- a/m68k_core.c	Tue Nov 21 19:07:43 2017 -0800
+++ b/m68k_core.c	Tue Nov 21 23:11:11 2017 -0800
@@ -1168,7 +1168,6 @@
 {
 	code_ptr addr = get_native_address_trans(context, address);
 	m68k_options * options = context->options;
-	context->should_return = 0;
 	options->start_context(addr, context);
 }
 
diff -r c5c022c7aa54 -r afa3fbb76bff nuklear_ui/blastem_nuklear.c
--- a/nuklear_ui/blastem_nuklear.c	Tue Nov 21 19:07:43 2017 -0800
+++ b/nuklear_ui/blastem_nuklear.c	Tue Nov 21 23:11:11 2017 -0800
@@ -48,15 +48,16 @@
 		}
 		nk_layout_row_static(context, 52, 300, 1);
 		if (nk_button_label(context, "Open")) {
+			char const *pieces[] = {current_path, PATH_SEP, entries[selected_entry].name};
 			if (entries[selected_entry].is_dir) {
 				char *old = current_path;
-				char const *pieces[] = {old, PATH_SEP, entries[selected_entry].name};
 				current_path = alloc_concat_m(3, pieces);
 				free(old);
 				free_dir_list(entries, num_entries);
 				entries = NULL;
 			} else {
-				//TODO: load ROM
+				current_system->next_rom =  alloc_concat_m(3, pieces);
+				current_system->request_exit(current_system);
 				current_view = view_play;
 			}
 		}