Merge pull request #7045

laanwj · laanwj · commit 72dccfc29dfc · 2015-11-24T09:51:02.000+01:00
2aa49ce Bugfix: Use unique autostart filenames on Linux for testnet/regtest (Luke Dashjr)
diff --git 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()

Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,10 @@ boost::filesystem::path static GetAutostartDir()`
`681`	`681`
`682`	`682`	`boost::filesystem::path static GetAutostartFilePath()`
`683`	`683`	`{`
`684`		`- return GetAutostartDir() / "bitcoin.desktop";`
	`684`	`+ std::string chain = ChainNameFromCommandLine();`
	`685`	`+ if (chain == CBaseChainParams::MAIN)`
	`686`	`+ return GetAutostartDir() / "bitcoin.desktop";`
	`687`	`+ return GetAutostartDir() / strprintf("bitcoin-%s.lnk", chain);`
`685`	`688`	`}`
`686`	`689`
`687`	`690`	`bool GetStartOnSystemStartup()`