Better shortcut (openethereum#3147)

gaoyang853 · Nov 3, 2016 · d1b9aa7 · d1b9aa7
1 parent 3cb355d
commit d1b9aa7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/nsis/installer.nsi b/nsis/installer.nsi
@@ -98,7 +98,8 @@ section "install"
 
 	# Start Menu
 	createDirectory "$SMPROGRAMS\${COMPANYNAME}"
-	createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME}.lnk" "$INSTDIR\parity.exe" "ui" "$INSTDIR\logo.ico"
+	createShortCut "$SMPROGRAMS\${COMPANYNAME}\${APPNAME} Ethereum.lnk" "$INSTDIR\ptray.exe" "ui" "$INSTDIR\logo.ico"
+	createShortCut "$DESKTOP\${APPNAME} Ethereum.lnk" "$INSTDIR\ptray.exe" "ui" "$INSTDIR\logo.ico"
 
 	# Firewall remove rules if exists
 	SimpleFC::AdvRemoveRule "Parity incoming peers (TCP:30303)"

diff --git a/windows/ptray/ptray.cpp b/windows/ptray/ptray.cpp
@@ -69,8 +69,12 @@ int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
 	UNREFERENCED_PARAMETER(lpCmdLine);
 
 	CreateMutex(0, FALSE, _T("Local\\ParityTray"));
-	if (GetLastError() == ERROR_ALREADY_EXISTS)
-		return -1;
+	if (GetLastError() == ERROR_ALREADY_EXISTS) {
+		// open the UI
+		OpenUI();
+		return 0;
+	}
+
 
 	LoadStringW(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING);
 	LoadStringW(hInstance, IDC_PTRAY, szWindowClass, MAX_LOADSTRING);