From 5a4089432cf35f95a58b7462a135f5a1e88cf235 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Wed, 2 Dec 2015 09:15:21 -0600 Subject: [PATCH 1/2] Tweak NanoUI Subsystem code --- code/controllers/subsystem/nano.dm | 14 ++++++-------- code/modules/nano/subsystem.dm | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/code/controllers/subsystem/nano.dm b/code/controllers/subsystem/nano.dm index 7bb22971e6f..7eb1587ef3d 100644 --- a/code/controllers/subsystem/nano.dm +++ b/code/controllers/subsystem/nano.dm @@ -15,14 +15,12 @@ var/datum/subsystem/nano/SSnano /datum/subsystem/nano/stat_entry() - ..("O: [open_uis.len]|P:[processing_uis.len]") // Show how many interfaces we have open/are processing. + ..("O:[open_uis.len]|P:[processing_uis.len]") // Show how many interfaces we have open/are processing. /datum/subsystem/nano/fire() // Process UIs. - for(var/thing in SSnano.processing_uis) - if(thing) - var/datum/nanoui/ui = thing - if(ui.src_object && ui.user) - ui.process() - continue - processing_uis.Remove(thing) + for(var/datum/nanoui/ui in processing_uis) + if(ui && ui.src_object && ui.user) + ui.process() + continue + processing_uis.Remove(ui) diff --git a/code/modules/nano/subsystem.dm b/code/modules/nano/subsystem.dm index 2d969d94bd6..a37f7ff18c8 100644 --- a/code/modules/nano/subsystem.dm +++ b/code/modules/nano/subsystem.dm @@ -103,7 +103,7 @@ for (var/ui_key in open_uis[src_object_key]) for (var/datum/nanoui/ui in open_uis[src_object_key][ui_key]) if(ui && ui.src_object && ui.user && ui.src_object.nano_host()) // Check the UI is valid. - ui.close() // Close the UI + ui.close() // Close the UI. close_count++ // Count each UI we close. return close_count From b8a04fb63e5b60bf3337f2e7ecceb0c2d8f34769 Mon Sep 17 00:00:00 2001 From: Bjorn Neergaard Date: Thu, 3 Dec 2015 10:28:01 -0600 Subject: [PATCH 2/2] Gotta go fast --- code/controllers/subsystem/nano.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/controllers/subsystem/nano.dm b/code/controllers/subsystem/nano.dm index 7eb1587ef3d..44665c1a57d 100644 --- a/code/controllers/subsystem/nano.dm +++ b/code/controllers/subsystem/nano.dm @@ -19,7 +19,8 @@ var/datum/subsystem/nano/SSnano /datum/subsystem/nano/fire() // Process UIs. - for(var/datum/nanoui/ui in processing_uis) + for(var/thing in processing_uis) + var/datum/nanoui/ui = thing if(ui && ui.src_object && ui.user) ui.process() continue