diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:13:46 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2012-06-14 18:13:46 +0000 |
| commit | 6ec9d30905e8df77e60d0195074920271abb977a (patch) | |
| tree | 59b21a9be7282b5ee3a2dc6c0b4f2d5a31882904 /src/main.cpp | |
| parent | 722ff53718333dc290760d528b7a561d29ab41a8 (diff) | |
| parent | 3703150d56ff6ee557ab330e55637c9c23835902 (diff) | |
| download | bitcoin-6ec9d30905e8df77e60d0195074920271abb977a.tar.xz | |
Merge branch '0.5.x' into 0.6.0.x
Conflicts:
src/main.h
src/net.cpp
src/serialize.h
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 7ffecaf734..a4b0a1d8cc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1840,7 +1840,7 @@ bool CheckDiskSpace(uint64 nAdditionalBytes) strMiscWarning = strMessage; printf("*** %s\n", strMessage.c_str()); ThreadSafeMessageBox(strMessage, "Bitcoin", wxOK | wxICON_EXCLAMATION); - CreateThread(Shutdown, NULL); + StartShutdown(); return false; } return true; |