diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-07 18:57:11 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-07 18:57:11 +0200 |
| commit | a0d2f9a12dad7b33a3f12d85dee8afa4155dbc99 (patch) | |
| tree | 24a475fe47ed00837fbed1836d03d933cfe7dbb2 /src/ui.cpp | |
| parent | f077d1ad62cba26b2620c87abba87be7fec15f0d (diff) | |
| parent | f92f022edaa2f14951b9ce8304a304ff9693ae16 (diff) | |
| download | bitcoin-a0d2f9a12dad7b33a3f12d85dee8afa4155dbc99.tar.xz | |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
.gitignore
Diffstat (limited to 'src/ui.cpp')
| -rw-r--r-- | src/ui.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ui.cpp b/src/ui.cpp index 198a27209a..6b7ecdbc8d 100644 --- a/src/ui.cpp +++ b/src/ui.cpp @@ -1805,7 +1805,11 @@ void SetStartOnSystemStartup(bool fAutoStart) { if (!fAutoStart) { +#if defined(BOOST_FILESYSTEM_VERSION) && BOOST_FILESYSTEM_VERSION >= 3 + unlink(GetAutostartFilePath().string().c_str()); +#else unlink(GetAutostartFilePath().native_file_string().c_str()); +#endif } else { |