diff options
| author | Pieter Wuille <[email protected]> | 2013-04-05 18:15:23 -0700 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2013-04-05 18:15:23 -0700 |
| commit | 484af4e2d164fc8acef60d09a19d51170e57fe8d (patch) | |
| tree | d405bf3636ccc26b3858c2e5faec8298da209556 /src/init.cpp | |
| parent | Merge pull request #2443 from Diapolo/Qt_addrbook (diff) | |
| parent | small indentation, space, formatting fixes (no code changes) (diff) | |
| download | discoin-484af4e2d164fc8acef60d09a19d51170e57fe8d.tar.xz discoin-484af4e2d164fc8acef60d09a19d51170e57fe8d.zip | |
Merge pull request #2456 from Diapolo/code-layout
small indentation, space, formatting fixes (no code changes)
Diffstat (limited to 'src/init.cpp')
| -rw-r--r-- | src/init.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/init.cpp b/src/init.cpp index ee69d2207..66272e842 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -217,16 +217,16 @@ bool AppInit(int argc, char* argv[]) PrintExceptionContinue(NULL, "AppInit()"); } if (!fRet) { - if (detectShutdownThread) - detectShutdownThread->interrupt(); - threadGroup.interrupt_all(); + if (detectShutdownThread) + detectShutdownThread->interrupt(); + threadGroup.interrupt_all(); } if (detectShutdownThread) { detectShutdownThread->join(); delete detectShutdownThread; - detectShutdownThread = NULL; + detectShutdownThread = NULL; } Shutdown(); @@ -376,7 +376,6 @@ struct CImportingNow } }; - void ThreadImport(std::vector<boost::filesystem::path> vImportFiles) { RenameThread("bitcoin-loadblk"); @@ -633,7 +632,6 @@ bool AppInit2(boost::thread_group& threadGroup) // ********************************************************* Step 6: network initialization int nSocksVersion = GetArg("-socks", 5); - if (nSocksVersion != 4 && nSocksVersion != 5) return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion)); @@ -733,6 +731,7 @@ bool AppInit2(boost::thread_group& threadGroup) fReindex = GetBoolArg("-reindex"); + // Todo: Check if needed, because in step 5 we do the same if (!bitdb.Open(GetDataDir())) { string msg = strprintf(_("Error initializing database environment %s!" |