[vlc-commits] nsis: don' t skip the components page until we were able to save user choices

[Ludovic Fauvet]

vlc/vlc-2.1 | branch: master | Ludovic Fauvet <etix at videolan.org> | Sat Sep 28 00:52:53 2013 +0200| [40ca7cdeb88dccd6a76d510dee1a7ace90b605af] | committer: Jean-Baptiste Kempf

nsis: don't skip the components page until we were able to save user choices

This change will make the transition easier between the previously released
installer (that doesn't remember user choices) and this one. Without it the
old installer would fall back to the "Recommended" preset.

(cherry picked from commit ac8330105892f9ec93a9c5464736037da832c11d)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=40ca7cdeb88dccd6a76d510dee1a7ace90b605af
---

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

diff --git a/extras/package/win32/NSIS/vlc.win32.nsi.in b/extras/package/win32/NSIS/vlc.win32.nsi.in
index df82620..156f356 100644
--- a/extras/package/win32/NSIS/vlc.win32.nsi.in
+++ b/extras/package/win32/NSIS/vlc.win32.nsi.in
@@ -749,9 +749,17 @@ Function PageFastUpdatePre
 FunctionEnd
 
 Function PageComponentsPre
+  ClearErrors
+  ReadRegStr $0 ${MEMENTO_REGISTRY_ROOT} `${MEMENTO_REGISTRY_KEY}` MementoSectionUsed
+  ; Backward compatibility:
+  ; Don't skip the components page until Memento was able to save the user choices.
+  IfErrors done
+
   ${If} $ReinstallType == 1
     Abort
   ${EndIf}
+
+done:
 FunctionEnd
 
 Function PageDirectoryPre