From 8937d4f9e5adad4f7b860350fbaa45a22ab75e04 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 12 Apr 2011 08:41:26 +0000 Subject: small patch from Dobz to clean up non-functional multiuser code for now, and ensure admin level is requested on starting. --- release/windows/installer/00.sconsblender.nsi | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/release/windows/installer/00.sconsblender.nsi b/release/windows/installer/00.sconsblender.nsi index 68d884beb68..f58a98c2136 100644 --- a/release/windows/installer/00.sconsblender.nsi +++ b/release/windows/installer/00.sconsblender.nsi @@ -3,21 +3,18 @@ ; ; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net) ; -; Requires the MoreInfo plugin - http://nsis.sourceforge.net/MoreInfo_plug-in -; SetCompressor /SOLID lzma Name "Blender [VERSION]" -!define MULTIUSER_EXECUTIONLEVEL Admin +RequestExecutionLevel admin !include "MUI.nsh" !include "WinVer.nsh" !include "FileFunc.nsh" !include "WordFunc.nsh" !include "nsDialogs.nsh" -!include "MultiUser.nsh" !include "x64.nsh" !define MUI_ABORTWARNING @@ -206,7 +203,7 @@ Section "Add Desktop Shortcut" DesktopShortcut SectionEnd Section "Open .blend files with Blender" BlendRegister -ExecWait '"$INSTDIR\blender.exe" -r' + ExecWait '"$INSTDIR\blender.exe" -r' SectionEnd UninstallText "This will uninstall Blender [VERSION], and all installed files. Before continuing make sure you have created backup of all the files you may want to keep: startup.blend, bookmarks.txt, recent-files.txt. Hit 'Uninstall' to continue." -- cgit v1.2.3