Merge pull request #1112 from jl777/jl777

Jl777
2018-12-18 05:45:46 -11:00
parent 37c9636c39 5488101f95
commit 1cfd8030e3
2 changed files with 15 additions and 3 deletions
--- a/src/cc/dapps/zmigrate.c
+++ b/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);