From a255d13b54bb31e3d20d9a207e97f34f028c96b9 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Thu, 13 Nov 2014 18:20:28 +0100
Subject: [PATCH] Windows: Uninstall start menu entries

---
 tools/update-server/version |  1 -
 windows/qtox.nsi            | 17 ++++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 tools/update-server/version

diff --git a/tools/update-server/version b/tools/update-server/version
deleted file mode 100644
index d8263ee98..000000000
--- a/tools/update-server/version
+++ /dev/null
@@ -1 +0,0 @@
-2
\ No newline at end of file
diff --git a/windows/qtox.nsi b/windows/qtox.nsi
index 36b01db21..1594b680b 100644
--- a/windows/qtox.nsi
+++ b/windows/qtox.nsi
@@ -338,17 +338,20 @@ Section Uninstall
   Delete "$INSTDIR\${UninstLog}"
   noLog:
   Delete /REBOOTOK "$INSTDIR\uninstall.exe"
-  RMDir /r /REBOOTOK $INSTDIR\bin"
+  RMDir /r /REBOOTOK "$INSTDIR\bin"
   RMDir /REBOOTOK "$INSTDIR"
   Pop $R2
   Pop $R1
   Pop $R0
  
+  ;Remove start menu entries
+  RMDir /r /REBOOTOK "$SMPROGRAMS\qTox"
+ 
   ;Remove registry keys
-    DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"
-    DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}"
-    DeleteRegKey HKCR "Applications\qtox.exe"
-	DeleteRegKey HKCR ".tox"
-    DeleteRegKey HKCR "tox"
-    DeleteRegKey HKCR "toxsave"
+  DeleteRegKey ${REG_ROOT} "${REG_APP_PATH}"
+  DeleteRegKey ${REG_ROOT} "${UNINSTALL_PATH}"
+  DeleteRegKey HKCR "Applications\qtox.exe"
+  DeleteRegKey HKCR ".tox"
+  DeleteRegKey HKCR "tox"
+  DeleteRegKey HKCR "toxsave"
 SectionEnd