Bugfixes

Author: perak

lib/quantum-circuit.js

@@ -4339,10 +4339,18 @@ QuantumCircuit.prototype.convertToCustomGate = function(gateName, decompose, add
 };
 
 QuantumCircuit.prototype.validCustomGateName = function(baseName) {
+	baseName = (baseName || "sub") + "";
+
 	var customGateNames = [];
 	if(this.customGates) {
-		if(!this.customGates[baseName]) {
-			return baseName;
+		if(!this.basicGates[baseName]) {
+			if(!this.customGates[baseName]) {
+				return baseName;
+			}
+		}
+
+		for(var gateName in this.basicGates) {
+			customGateNames.push(gateName);
 		}
 
 		for(var gateName in this.customGates) {
@@ -4354,7 +4362,7 @@ QuantumCircuit.prototype.validCustomGateName = function(baseName) {
 	var validName = "";
 	do {
 		index++;
-		validName = (baseName || "sub") + index;
+		validName = baseName + index;
 	} while(customGateNames.indexOf(validName) >= 0);
 
 	return validName;