diff options
| author | Wladimir J. van der Laan <[email protected]> | 2013-06-03 09:17:55 -0700 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2013-06-03 09:17:55 -0700 |
| commit | c83d4d2170bf00863bd5c21c6eaea91b00390e72 (patch) | |
| tree | 658a70c0c3009920fecb4cc33e88653ad8052ddb /src/qt/bitcoin.cpp | |
| parent | Merge pull request #2727 from TheBlueMatt/master (diff) | |
| parent | Merge branch 'master' of git://github.com/bitcoin/bitcoin into prefsFix (diff) | |
| download | discoin-c83d4d2170bf00863bd5c21c6eaea91b00390e72.tar.xz discoin-c83d4d2170bf00863bd5c21c6eaea91b00390e72.zip | |
Merge pull request #2613 from jonasschnelli/prefsFix
MaxOSX: settings fixes (#2371)
Diffstat (limited to 'src/qt/bitcoin.cpp')
| -rw-r--r-- | src/qt/bitcoin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp index 9bcac5979..73a5a12ef 100644 --- a/src/qt/bitcoin.cpp +++ b/src/qt/bitcoin.cpp @@ -215,9 +215,12 @@ int main(int argc, char *argv[]) try { +#ifndef Q_OS_MAC // Regenerate startup link, to fix links to old versions + // OSX: makes no sense on mac and might also scan/mount external (and sleeping) volumes (can take up some secs) if (GUIUtil::GetStartOnSystemStartup()) GUIUtil::SetStartOnSystemStartup(true); +#endif boost::thread_group threadGroup; |