Improved error handling.

totaljs · Nov 7, 2024 · 22f7a7f · 22f7a7f
1 parent 1c9c2cf
commit 22f7a7f
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/flow-flowstream.js b/flow-flowstream.js
@@ -1320,7 +1320,7 @@ function init_current(meta, callback, nested) {
 
 			if (instance) {
 				if (typeof(instance) === 'string') {
-					if (source === 'add') {
+					if (source === 'add' || source === 'register') {
 						componentid = instance;
 						F.error(err, 'FlowStream | register component | ' + instance);
 					} else if (meta.design[instance]) {
@@ -1339,9 +1339,6 @@ function init_current(meta, callback, nested) {
 				} else if (source === 'instance_make') {
 					instanceid = instance.id;
 					componentid = instance.component;
-				} else if (source === 'register') {
-					instanceid = '';
-					componentid = instance;
 				} else {
 					instanceid = instance.id;
 					componentid = instance.module.id;
@@ -1449,9 +1446,11 @@ function init_current(meta, callback, nested) {
 				} else if (source === 'register') {
 					instanceid = '';
 					componentid = instance;
+				} else if (source === 'add') {
+					componentid = instance;
 				} else {
 					instanceid = instance.id;
-					componentid = instance.module.id;
+					componentid = instance.module ? instance.module.id : null;
 				}
 			}