aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-11-24 09:50:57 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-11-24 09:51:02 +0100
commit72dccfc29dfc38e107c7c8de304f9894bfd954fb (patch)
treef6237843670d6970ffd470e233d03bdc682b8c98 /src
parentb1fcdec6879048bb0ba4acf41dfbc379842c8afc (diff)
parent2aa49ce9fe618bda9bf70fd57b23fe4802f0aeff (diff)
Merge pull request #7045
2aa49ce Bugfix: Use unique autostart filenames on Linux for testnet/regtest (Luke Dashjr)
Diffstat (limited to 'src')
-rw-r--r--src/qt/guiutil.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index 845459b76a..6dce9370d7 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -681,7 +681,10 @@ boost::filesystem::path static GetAutostartDir()
boost::filesystem::path static GetAutostartFilePath()
{
- return GetAutostartDir() / "bitcoin.desktop";
+ std::string chain = ChainNameFromCommandLine();
+ if (chain == CBaseChainParams::MAIN)
+ return GetAutostartDir() / "bitcoin.desktop";
+ return GetAutostartDir() / strprintf("bitcoin-%s.lnk", chain);
}
bool GetStartOnSystemStartup()