From 722964362a4e1c2297fe8181dd417f6ce7606c6d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Thu, 27 Dec 2018 08:28:37 -1100
Subject: [PATCH] Fix -ac_import

---
 src/komodo_utils.h | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/komodo_utils.h b/src/komodo_utils.h
index 2a3617748..eeedf1949 100644
--- a/src/komodo_utils.h
+++ b/src/komodo_utils.h
@@ -1777,10 +1777,13 @@ void komodo_args(char *argv0)
         ASSETCHAINS_CODAPORT = GetArg("-ac_coda",0);
         
         ASSETCHAINS_SELFIMPORT = GetArg("-ac_import",""); // BEAM, CODA, PUBKEY, GATEWAY
-        if ( ASSETCHAINS_SELFIMPORT == "PUBKEY" && strlen(ASSETCHAINS_OVERRIDE_PUBKEY.c_str()) != 66 )
+        if ( ASSETCHAINS_SELFIMPORT == "PUBKEY" )
         {
-            fprintf(stderr,"invalid -ac_pubkey for -ac_import=PUBKEY\n");
-            ASSETCHAINS_SELFIMPORT = "";
+            if ( strlen(ASSETCHAINS_OVERRIDE_PUBKEY.c_str()) != 66 )
+            {
+                fprintf(stderr,"invalid -ac_pubkey for -ac_import=PUBKEY\n");
+                ASSETCHAINS_SELFIMPORT = "";
+            }
         }
         else if ( ASSETCHAINS_SELFIMPORT == "BEAM" && ASSETCHAINS_BEAMPORT == 0 )
         {
@@ -1831,7 +1834,7 @@ void komodo_args(char *argv0)
                     ASSETCHAINS_COMMISSION = 53846154; // maps to 35%
                     printf("ASSETCHAINS_COMMISSION defaulted to 35%% when founders reward active\n");
                 }
-                else
+                else if ( ASSETCHAINS_SELFIMPORT.size() == 0 )
                 {
                     //ASSETCHAINS_OVERRIDE_PUBKEY.clear();
                     printf("-ac_perc must be set with -ac_pubkey\n");