Un-installer: Also remove the shell integration.

This commit is contained in:
LoRd_MuldeR 2015-10-20 22:01:39 +02:00
parent e2613988ea
commit d8cb000231
3 changed files with 14 additions and 7 deletions

View File

@ -701,6 +701,7 @@ Section "Uninstall"
ReadRegStr $R0 HKLM "${MyRegPath}" "ExecutableName" ReadRegStr $R0 HKLM "${MyRegPath}" "ExecutableName"
${IfThen} "$R0" == "" ${|} StrCpy $R0 "LameXP.exe" ${|} ${IfThen} "$R0" == "" ${|} StrCpy $R0 "LameXP.exe" ${|}
ExecWait '"$INSTDIR\$R0" --uninstall'
Delete /REBOOTOK "$INSTDIR\$R0" Delete /REBOOTOK "$INSTDIR\$R0"
!insertmacro CleanUpFiles /REBOOTOK !insertmacro CleanUpFiles /REBOOTOK

View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_MINOR_LO 2
#define VER_LAMEXP_TYPE RC #define VER_LAMEXP_TYPE RC
#define VER_LAMEXP_PATCH 4 #define VER_LAMEXP_PATCH 4
#define VER_LAMEXP_BUILD 1812 #define VER_LAMEXP_BUILD 1815
#define VER_LAMEXP_CONFG 1700 #define VER_LAMEXP_CONFG 1700
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

View File

@ -31,6 +31,7 @@
#include "Model_FileList.h" #include "Model_FileList.h"
#include "Model_AudioFile.h" #include "Model_AudioFile.h"
#include "Encoder_Abstract.h" #include "Encoder_Abstract.h"
#include "ShellIntegration.h"
//MUitls //MUitls
#include <MUtils/Global.h> #include <MUtils/Global.h>
@ -196,6 +197,14 @@ static int lamexp_main(int &argc, char **argv)
qDebug(" "); qDebug(" ");
} }
//Uninstall?
if(arguments.contains("uninstall"))
{
qWarning("Un-install: Removing LameXP shell integration...");
ShellIntegration::remove(false);
return EXIT_SUCCESS;
}
//Detect CPU capabilities //Detect CPU capabilities
const MUtils::CPUFetaures::cpu_info_t cpuFeatures = MUtils::CPUFetaures::detect(); const MUtils::CPUFetaures::cpu_info_t cpuFeatures = MUtils::CPUFetaures::detect();
qDebug(" CPU vendor id : %s (Intel=%s)", cpuFeatures.vendor, MUTILS_BOOL2STR(cpuFeatures.intel)); qDebug(" CPU vendor id : %s (Intel=%s)", cpuFeatures.vendor, MUTILS_BOOL2STR(cpuFeatures.intel));
@ -234,13 +243,10 @@ static int lamexp_main(int &argc, char **argv)
} }
//Kill application? //Kill application?
for(int i = 0; i < argc; i++)
{
if(arguments.contains("kill") || arguments.contains("force-kill")) if(arguments.contains("kill") || arguments.contains("force-kill"))
{ {
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
}
//Self-test //Self-test
if(MUTILS_DEBUG) if(MUTILS_DEBUG)