aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main.cpp1
-rw-r--r--src/qt/bitcoin.cpp2
-rw-r--r--src/qt/locale/bitcoin_en.ts2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 40c713ce93..7b9ca2878c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2875,6 +2875,7 @@ bool static LoadBlockIndexDB()
bool VerifyDB(int nCheckLevel, int nCheckDepth)
{
+ LOCK(cs_main);
if (chainActive.Tip() == NULL || chainActive.Tip()->pprev == NULL)
return true;
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index c05692efa3..31716ab825 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -595,7 +595,7 @@ int main(int argc, char *argv[])
app.createWindow(isaTestNet);
app.requestInitialize();
#if defined(Q_OS_WIN) && QT_VERSION >= 0x050000
- WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("Bitcoin Core did't yet exit safely..."), (HWND)app.getMainWinId());
+ WinShutdownMonitor::registerShutdownBlockReason(QObject::tr("Bitcoin Core didn't yet exit safely..."), (HWND)app.getMainWinId());
#endif
app.exec();
app.requestShutdown();
diff --git a/src/qt/locale/bitcoin_en.ts b/src/qt/locale/bitcoin_en.ts
index d857a1444f..4b541eabe9 100644
--- a/src/qt/locale/bitcoin_en.ts
+++ b/src/qt/locale/bitcoin_en.ts
@@ -1729,7 +1729,7 @@ Address: %4
</message>
<message>
<location line="+60"/>
- <source>Bitcoin Core did&apos;t yet exit safely...</source>
+ <source>Bitcoin Core didn&apos;t yet exit safely...</source>
<translation type="unfinished"></translation>
</message>
<message>