From e57eaa77eb5155402c2ce3c5e2d81aa375825ff7 Mon Sep 17 00:00:00 2001
From: Smeulf <smeulf@team-mediaportal.com>
Date: Fri, 30 Dec 2011 23:27:52 +0100
Subject: [PATCH] Moved shortcuts from "StartMenu\MediaPortal" 2 to "StartMenu\Team MediaPortal\MediaPortal 2"

---
 MediaPortal/Setup/MP2-Setup/MediaPortal2.wxs |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/MediaPortal/Setup/MP2-Setup/MediaPortal2.wxs b/MediaPortal/Setup/MP2-Setup/MediaPortal2.wxs
index 2fc469e..cba2afc 100644
--- a/MediaPortal/Setup/MP2-Setup/MediaPortal2.wxs
+++ b/MediaPortal/Setup/MP2-Setup/MediaPortal2.wxs
@@ -109,13 +109,33 @@
       </Directory>
 
       <Directory Id="ProgramMenuFolder">
-        <Directory Id="MP2StartMenu" Name="MediaPortal 2" />
+        <Directory Id="TeamMediaPortalStartMenu" Name="Team MediaPortal">
+          <Directory Id="MP2StartMenu" Name="MediaPortal 2" />
+        </Directory>
       </Directory>
 
       <Directory Id="DesktopFolder" />
     </Directory>
 
     <!-- Shortcuts -->
+    <DirectoryRef Id="TeamMediaPortalStartMenu">
+      <Component Id="TeamMediaPortalStartMenu" Guid="EBCECF2A-3330-11E1-BB19-75D94724019B">
+        <!--
+        Fix ICE 38 by adding a dummy registry key that is the key for this shortcut.
+        http://msdn.microsoft.com/library/en-us/msi/setup/ice38.asp
+        -->
+        <!-- todo: why is $(var.RegKeyInstall) not working here? -->
+        <RegistryValue Root="HKCU"
+                       Key="Software\Team MediaPortal\MediaPortal 2\Install"
+                       Name="TeamMediaPortalStartMenu"
+                       Type="string"
+                       Value="1"
+                       KeyPath="yes" />
+        <RemoveFolder Id="Remove.TeamMediaPortalStartMenu"
+                      On="uninstall" />
+      </Component>
+    </DirectoryRef>
+
     <DirectoryRef Id="MP2StartMenu">
       <Component Id="MP2StartMenu" Guid="DB88BD5D-BD35-402E-ABD5-A8EBB1F0FA42">
         <Shortcut Id="MP2Uninstall.StartMenu.Shortcut"
@@ -148,6 +168,7 @@
              Description="!(loc.F_MediaPortal_Desc)">
       <FeatureRef Id="Client" />
       <FeatureRef Id="Server" />
+      <ComponentRef Id="TeamMediaPortalStartMenu" />
       <ComponentRef Id="MP2StartMenu" />
     </Feature>
 
-- 
1.7.4.msysgit.0