From 187e09dd48606e22ca9f4fe7877cd5db28ac9b48 Mon Sep 17 00:00:00 2001 From: Jeff Parsons Date: Mon, 19 Jun 2017 09:00:03 -0700 Subject: [PATCH] Automatically set the debugger property if an XML file in a "debugger" folder is selected (a convenience feature) --- modules/markout/lib/markout.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/markout/lib/markout.js b/modules/markout/lib/markout.js index b12bb9d9d..4a0d627db 100644 --- a/modules/markout/lib/markout.js +++ b/modules/markout/lib/markout.js @@ -1198,10 +1198,11 @@ MarkOut.prototype.convertMDMachineLinks = function(sBlock) if (this.aMachineDefs[sMachineID]) { machine = this.aMachineDefs[sMachineID]; sMachineType = machine['type'] || "PCx86"; + sMachineXMLFile = machine['config'] || this.sMachineFile || "machine.xml"; + if (sMachineXMLFile.indexOf("debugger") >= 0) machine['debugger'] = "true"; sMachineOptions = ((sMachineType.indexOf("-dbg") > 0 || machine['debugger'] == "true")? "debugger" : ""); if (machine['sticky']) sMachineOptions += (sMachineOptions? "," : "") + "sticky"; sMachineType = sMachineType.replace("-dbg", ""); - sMachineXMLFile = machine['config'] || this.sMachineFile || "machine.xml"; sMachineXSLFile = machine['template'] || ""; sMachineVersion = ((machine['uncompiled'] == "true")? "uncompiled" : ""); sMachineParms = machine['parms'] || "";