aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/macdeploy/macdeployqtplus4
-rw-r--r--src/main.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index 5c310df1fc..599713fbbb 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -580,7 +580,7 @@ try:
except RuntimeError as e:
if verbose >= 1:
sys.stderr.write("Error: %s\n" % str(e))
- sys.exit(ret)
+ sys.exit(1)
# ------------------------------------------------
@@ -593,7 +593,7 @@ if config.plugins:
except RuntimeError as e:
if verbose >= 1:
sys.stderr.write("Error: %s\n" % str(e))
- sys.exit(ret)
+ sys.exit(1)
# ------------------------------------------------
diff --git a/src/main.cpp b/src/main.cpp
index 3bed4fdc44..c54fa65233 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -4463,7 +4463,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
uint256 hash = state.vBlocksToDownload.front();
vGetData.push_back(CInv(MSG_BLOCK, hash));
MarkBlockAsInFlight(pto->GetId(), hash);
- LogPrint("net", "Requesting block %s from %s\n", hash.ToString().c_str(), state.name.c_str());
+ LogPrint("net", "Requesting block %s from %s\n", hash.ToString(), state.name);
if (vGetData.size() >= 1000)
{
pto->PushMessage("getdata", vGetData);