#21 progress reporting minor changes

BeamMW · Nov 20, 2018 · b02df31 · b02df31
1 parent bea6801
commit b02df31
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/node/node.cpp b/node/node.cpp
@@ -526,14 +526,20 @@ void Node::Processor::AdjustFossilEnd(Height& h)
 
 void Node::Processor::OnStateData()
 {
-	++m_DownloadedHeaders;
-	ReportProgress();
+    if (m_DownloadedHeaders < m_RequestedCount)
+    {
+        ++m_DownloadedHeaders;
+        ReportProgress();
+    }
 }
 
 void Node::Processor::OnBlockData()
 {
-	++m_DownloadedBlocks;
-	ReportProgress();
+    if (m_DownloadedBlocks < m_RequestedCount)
+    {
+        ++m_DownloadedBlocks;
+        ReportProgress();
+    }
 }
 
 bool Node::Processor::OpenMacroblock(Block::BodyBase::RW& rw, const NodeDB::StateID& sid)

diff --git a/ui/viewmodel/restore_view.cpp b/ui/viewmodel/restore_view.cpp
@@ -72,9 +72,12 @@ void RestoreViewModel::onSyncProgressUpdated(int done, int total)
 
 void RestoreViewModel::onNodeSyncProgressUpdated(int done, int total)
 {
-    _nodeDone = done;
-    _nodeTotal = total;
-    updateProgress();
+    if (!_walletConnected) // ignore node progress if wallet is connected
+    {
+        _nodeDone = done;
+        _nodeTotal = total;
+        updateProgress();
+    }
 }
 
 void RestoreViewModel::updateProgress()
@@ -94,7 +97,7 @@ void RestoreViewModel::updateProgress()
         }
         nodeSyncProgress = static_cast<double>(_nodeDone) / _nodeTotal;
     }
-
+    
     if (nodeSyncProgress >= 1.0 && _walletConnected == false)
     {
         syncWithNode();