From 714e29c8870ccea1444b47aea25032cc1b72a37a Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Fri, 23 May 2014 17:37:36 -0700 Subject: [PATCH] fix credit amount in window title --- domain-server/src/DomainServer.cpp | 2 +- interface/src/Application.cpp | 3 ++- libraries/networking/src/DataServerAccountInfo.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 9cd7080347..8efdeed8a7 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -887,7 +887,7 @@ QJsonObject DomainServer::jsonObjectForNode(const SharedNodePointer& node) { float pendingCreditAmount = 0; while (i != _pendingAssignmentCredits.end() && i.key() == nodeData->getWalletUUID()) { - pendingCreditAmount += i.value()->getAmount() / (float) SATOSHIS_PER_CREDIT; + pendingCreditAmount += i.value()->getAmount() / SATOSHIS_PER_CREDIT; ++i; } diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 83568998b6..502b1f3ed7 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3108,7 +3108,8 @@ void Application::updateWindowTitle(){ AccountManager& accountManager = AccountManager::getInstance(); if (accountManager.getAccountInfo().hasBalance()) { - float creditBalance = accountManager.getAccountInfo().getBalance() / (float) SATOSHIS_PER_CREDIT; + qDebug() << accountManager.getAccountInfo().getBalance(); + float creditBalance = accountManager.getAccountInfo().getBalance() / SATOSHIS_PER_CREDIT; QString creditBalanceString; creditBalanceString.sprintf("%.8f", creditBalance); diff --git a/libraries/networking/src/DataServerAccountInfo.h b/libraries/networking/src/DataServerAccountInfo.h index f37e05ff63..f6c6bf2797 100644 --- a/libraries/networking/src/DataServerAccountInfo.h +++ b/libraries/networking/src/DataServerAccountInfo.h @@ -16,7 +16,7 @@ #include "OAuthAccessToken.h" -const float SATOSHIS_PER_CREDIT = 10.0e8f; +const float SATOSHIS_PER_CREDIT = 10000000.0f; class DataServerAccountInfo : public QObject { Q_OBJECT