From: Samuli Seppänen <samuli@openvpn.net>
Date: Fri, 15 Apr 2011 13:25:17 +0000 (+0300)
Subject: Fixed a bug with GUI icon deletion on upgrade from 2.2-RC or earlier
X-Git-Tag: v2.2.0~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cc2b62d97d651ce9b05466928faba3b463838b7;p=thirdparty%2Fopenvpn.git

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)
---

diff --git a/win/openvpn.nsi b/win/openvpn.nsi
index bad1ef4d9..d3f80d0c9 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