summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Seppänen <samuli@openvpn.net>2011-04-15 16:25:17 +0300
committerDavid Sommerseth <davids@redhat.com>2011-04-15 16:10:52 +0200
commit1cc2b62d97d651ce9b05466928faba3b463838b7 (patch)
tree5affa5bd06ff7824a9107ef8b826e6f1a02b9502
parentd1a24b6fe38e15e02e607a71161b3f3c8a7bbad7 (diff)
downloadopenvpn-1cc2b62d97d651ce9b05466928faba3b463838b7.tar.gz
openvpn-1cc2b62d97d651ce9b05466928faba3b463838b7.tar.xz
openvpn-1cc2b62d97d651ce9b05466928faba3b463838b7.zip
Fixed a bug with GUI icon deletion on upgrade from 2.2-RC or earlier
This bug was introduced in commit 110e42d199e735ab1a31388c5678f59d0fa9510c. Trac-ticket: 120 Signed-off-by: Samuli Seppänen <samuli@openvpn.net> Acked-by: David Sommerseth <davids@redhat.com> Signed-off-by: David Sommerseth <davids@redhat.com> (cherry picked from commit 6d1d08f6792109a4a4cdd9cd0936fd4338c76fa1)
-rwxr-xr-xwin/openvpn.nsi6
1 files changed, 6 insertions, 0 deletions
diff --git a/win/openvpn.nsi b/win/openvpn.nsi
index bad1ef4..d3f80d0 100755
--- a/win/openvpn.nsi
+++ b/win/openvpn.nsi
@@ -237,6 +237,12 @@ Section -pre
Sleep 3000
+ # Fix for Trac ticket 120. Remove after 2.3 has been released.
+ !ifdef USE_GUI
+ SetShellVarContext current
+ Delete "$DESKTOP\${PRODUCT_NAME} GUI.lnk"
+ !endif
+
SectionEnd
Section "${PRODUCT_NAME} User-Space Components" SecOpenVPNUserSpace