Merge pull request #33 from navcoin/master

merging master into 4.7.0
proletesseract · Jul 21, 2019 · 66ac0f4 · 66ac0f4
2 parents 4df887f + 4337157
commit 66ac0f4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/qt/navcoinunits.cpp b/src/qt/navcoinunits.cpp
@@ -290,14 +290,20 @@ QString NavCoinUnits::format(int unit, const CAmount& nIn, bool fPlus, Separator
     qint64 coin = factor(unit);
     int num_decimals = decimals(unit);
     qint64 n_abs = (n > 0 ? n : -n);
-    double quotient;
+    double quotient = 0;
+    double quotientD = 0;
     qint64 remainder;
 
-    quotient = n_abs / coin;
+    // Check if we have a coin
+    if (coin > 0)
+    {
+        quotient = n_abs / coin;
+        quotientD = (double) n_abs / (double) coin;
+    }
 
     std::ostringstream out;
     out << std::setprecision(num_decimals) << std::fixed
-        << std::showpoint << (double)n_abs / (double)coin;
+        << std::showpoint << quotientD;
     std::istringstream in(out.str());
     std::string wholePart;
     std::getline(in, wholePart, '.');

diff --git a/src/qt/res/icons/Icon.svg b/src/qt/res/icons/Icon.svg
diff --git a/src/qt/res/icons/logo.svg b/src/qt/res/icons/logo.svg