From acae0682119411c3c5d1cb94892e5e4f30c762f9 Mon Sep 17 00:00:00 2001
From: de4dot <de4dot@gmail.com>
Date: Tue, 19 Nov 2013 17:46:16 +0100
Subject: [PATCH] Fix merge

---
 de4dot.code/deobfuscators/Confuser/Deobfuscator.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/de4dot.code/deobfuscators/Confuser/Deobfuscator.cs b/de4dot.code/deobfuscators/Confuser/Deobfuscator.cs
index 9b6b7064..426bce1f 100644
--- a/de4dot.code/deobfuscators/Confuser/Deobfuscator.cs
+++ b/de4dot.code/deobfuscators/Confuser/Deobfuscator.cs
@@ -28,12 +28,13 @@ namespace de4dot.code.deobfuscators.Confuser {
 	public class DeobfuscatorInfo : DeobfuscatorInfoBase {
 		public const string THE_NAME = "Confuser";
 		public const string THE_TYPE = "cr";
+		const string DEFAULT_REGEX = DeobfuscatorBase.DEFAULT_VALID_NAME_REGEX;
 		BoolOption removeAntiDebug;
 		BoolOption removeAntiDump;
 		BoolOption decryptMainAsm;
 
 		public DeobfuscatorInfo()
-			: base() {
+			: base(DEFAULT_REGEX) {
 			removeAntiDebug = new BoolOption(null, MakeArgName("antidb"), "Remove anti debug code", true);
 			removeAntiDump = new BoolOption(null, MakeArgName("antidump"), "Remove anti dump code", true);
 			decryptMainAsm = new BoolOption(null, MakeArgName("decrypt-main"), "Decrypt main embedded assembly", true);
@@ -49,10 +50,10 @@ namespace de4dot.code.deobfuscators.Confuser {
 
 		public override IDeobfuscator CreateDeobfuscator() {
 			return new Deobfuscator(new Deobfuscator.Options {
-				ValidNameRegex = validNameRegex.get(),
-				RemoveAntiDebug = removeAntiDebug.get(),
-				RemoveAntiDump = removeAntiDump.get(),
-				DecryptMainAsm = decryptMainAsm.get(),
+				ValidNameRegex = validNameRegex.Get(),
+				RemoveAntiDebug = removeAntiDebug.Get(),
+				RemoveAntiDump = removeAntiDump.Get(),
+				DecryptMainAsm = decryptMainAsm.Get(),
 			});
 		}