Merge pull request #1112 from jl777/jl777

Jl777

src/cc/dapps/zmigrate.c

@@ -984,8 +984,16 @@ again:
     {
         z_exportkey(privkey,coinstr,"",zcaddr);
         printf("zcaddr.(%s) -> z_exportkey.(%s)\n",zcaddr,privkey);
-        while ( z_mergetoaddress(opidstr,coinstr,"",zcaddr) > 0 )
+        while ( 1 )
-            ;
+        {
+            if ( have_pending_opid(coinstr,0) != 0 )
+            {
+                sleep(10);
+                continue;
+            }
+            if ( z_mergetoaddress(opidstr,coinstr,"",zcaddr) <= 0 )
+                break;
+        }
     }
     printf("start processing zmigrate\n");
     lastopid = (uint32_t)time(NULL);

src/init.cpp

@@ -76,6 +76,7 @@ using namespace std;
 extern void ThreadSendAlert();
 extern int32_t KOMODO_LOADINGBLOCKS;
 extern bool VERUS_MINTBLOCKS;
+extern char ASSETCHAINS_SYMBOL[];
 
 ZCJoinSplit* pzcashParams = NULL;
 
@@ -195,7 +196,10 @@ void Shutdown()
     /// for example if the data directory was found to be locked.
     /// Be sure that anything that writes files or flushes caches only does this if the respective
     /// module was initialized.
-    RenameThread("verus-shutoff");
+    static char shutoffstr[128];
+    sprintf(shutoffstr,"%s-shutoff",ASSETCHAINS_SYMBOL);
+    //RenameThread("verus-shutoff");
+    RenameThread(shutoffstr);
     mempool.AddTransactionsUpdated(1);
 
     StopHTTPRPC();