diff options
| author | Pieter Wuille <[email protected]> | 2012-04-04 05:03:07 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2012-04-04 05:03:07 -0700 |
| commit | b0a7e05a45a925d78efd00ecca6dce9b7a9530f9 (patch) | |
| tree | 13d0f8f8650b545b767c3e6b8de3e2effa385f2f /src/main.cpp | |
| parent | Merge pull request #1025 from Diapolo/GUI-BlockDL (diff) | |
| parent | Move from noui.h / ui.h to one ui_interface.h with dummy implementation for t... (diff) | |
| download | discoin-b0a7e05a45a925d78efd00ecca6dce9b7a9530f9.tar.xz discoin-b0a7e05a45a925d78efd00ecca6dce9b7a9530f9.zip | |
Merge pull request #1019 from laanwj/2012_03_uirefactor
Streamline UI ↔ Core interface
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index ca75b9fdb..7c49316b4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1811,8 +1811,8 @@ bool CheckDiskSpace(uint64 nAdditionalBytes) string strMessage = _("Warning: Disk space is low "); strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); - ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION); - CreateThread(Shutdown, NULL); + ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION | wxMODAL); + QueueShutdown(); return false; } return true; @@ -3450,8 +3450,6 @@ void static BitcoinMiner(CWallet *pwallet) dHashesPerSec = 1000.0 * nHashCounter / (GetTimeMillis() - nHPSTimerStart); nHPSTimerStart = GetTimeMillis(); nHashCounter = 0; - string strStatus = strprintf(" %.0f khash/s", dHashesPerSec/1000.0); - UIThreadCall(boost::bind(CalledSetStatusBar, strStatus, 0)); static int64 nLogTime; if (GetTime() - nLogTime > 30 * 60) { @@ -3508,7 +3506,6 @@ void static ThreadBitcoinMiner(void* parg) vnThreadsRunning[THREAD_MINER]--; PrintException(NULL, "ThreadBitcoinMiner()"); } - UIThreadCall(boost::bind(CalledSetStatusBar, "", 0)); nHPSTimerStart = 0; if (vnThreadsRunning[THREAD_MINER] == 0) dHashesPerSec = 0; |