diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-06 17:45:20 -0400 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-04-06 17:45:20 -0400 |
| commit | 9bf1140b90387643ad83e89199e391d002352b22 (patch) | |
| tree | 63db9580067c0744b12518cad28a36d541079baa /src | |
| parent | 892fcaf291cb9fc0f9efd4244f01b6b6529409ba (diff) | |
| parent | 527b512cf754bc7846852f3a4a61d8b364c5abc3 (diff) | |
| download | bitcoin-9bf1140b90387643ad83e89199e391d002352b22.tar.xz | |
Merge branch '0.5.0.x' into 0.5.x
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/bitcoin.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 4fed781ebb..9ef7d5b4e0 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -8,6 +8,7 @@ #include "headers.h" #include "init.h" +#include "util.h" #include <QApplication> #include <QMessageBox> @@ -45,7 +46,7 @@ int ThreadSafeMessageBox(const std::string& message, const std::string& caption, if (modal) while (!guiref) - sleep(1); + Sleep(1000); // Message from network thread if(guiref) |