[vlc-devel] [PATCH 1/2] NSIS: don't uninstall the ActiveX if it wasn't installed

[Steve Lhomme]

---
 extras/package/win32/NSIS/vlc.win32.nsi.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index 35fef7aa00b2..55897d911a40 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -816,10 +816,12 @@ Section "un.$(Name_Section91)" SEC91
   !insertmacro MacroSkinExtensions UnRegisterExtensionSection
   !insertmacro DeleteContextMenuExt "Directory"
 
+!ifdef INSTALL_ACTIVEX
   ;remove activex plugin
 @HAVE_WIN64_FALSE@ UnRegDLL "$INSTDIR\axvlc.dll"
 @HAVE_WIN64_TRUE@  ExecWait 'regsvr32.exe /s /u "$INSTDIR\axvlc.dll"'
   Delete /REBOOTOK "$INSTDIR\axvlc.dll"
+!endif
 
   ;remove mozilla plugin
   Push $R0
-- 
2.26.2