Bugfix: Use unique autostart filenames on Linux for testnet/regtest

luke-jr · luke-jr · commit 2aa49ce9fe61 · 2015-11-17T20:31:00.000Z
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -354,7 +354,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
`@@ -354,7 +354,10 @@ boost::filesystem::path static GetAutostartDir()`
`354`	`354`
`355`	`355`	`boost::filesystem::path static GetAutostartFilePath()`
`356`	`356`	`{`
`357`		`- return GetAutostartDir() / "bitcoin.desktop";`
	`357`	`+ std::string chain = ChainNameFromCommandLine();`
	`358`	`+ if (chain == CBaseChainParams::MAIN)`
	`359`	`+ return GetAutostartDir() / "bitcoin.desktop";`
	`360`	`+ return GetAutostartDir() / strprintf("bitcoin-%s.lnk", chain);`
`358`	`361`	`}`
`359`	`362`
`360`	`363`	`bool GetStartOnSystemStartup()`