From f4f390fb01bcb2845b658796c9cf7ee64ff83da8 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 25 Nov 2002 20:16:57 +0000
Subject: [PATCH] InitPluginsDir now causes to Init___PluginsDir to always get
 added

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1835 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/script.cpp | 6 ++++--
 Source/tokens.cpp | 2 +-
 Source/tokens.h   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Source/script.cpp b/Source/script.cpp
index ba7c8b2d..1d5049b0 100644
--- a/Source/script.cpp
+++ b/Source/script.cpp
@@ -3835,10 +3835,12 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
         ERROR_MSG("Error: Plugin dll for command \"%s\" not found.\n",line.gettoken_str(0));
     }
     return PS_ERROR;
-    case TOK_INITPLUGINDIR:
+    case TOK_INITPLUGINSDIR:
     {
       int ret;
       SCRIPT_MSG("%s\n",line.gettoken_str(0));
+      if (uninstall_mode) uninst_plugin_used = true;
+      else plugin_used = true;
       // Call [un.]Initialize_____Plugins
       ent.which=EW_CALL;
       ent.offsets[0]=ns_func.add(uninstall_mode?"un.Initialize_____Plugins":"Initialize_____Plugins",0);
@@ -3855,7 +3857,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
 #else
     case TOK_PLUGINDIR:
     case TOK__PLUGINCOMMAND:
-    case TOK_INITPLUGINDIR:
+    case TOK_INITPLUGINSDIR:
     {
       ERROR_MSG("Error: %s specified, NSIS_CONFIG_PLUGIN_SUPPORT not defined.\n",line.gettoken_str(0));
     }
diff --git a/Source/tokens.cpp b/Source/tokens.cpp
index 4c33955f..3b712a8b 100644
--- a/Source/tokens.cpp
+++ b/Source/tokens.cpp
@@ -204,7 +204,7 @@ static tokenType tokenlist[TOK__LAST] =
 {TOK_GETCURRENTADDR,"GetCurrentAddress",1,0,"output"},
 
 {TOK_PLUGINDIR,"PluginDir",1,0,"new_plugin_directory"},
-{TOK_INITPLUGINDIR,"InitPluginsDir",0,0,""}
+{TOK_INITPLUGINSDIR,"InitPluginsDir",0,0,""}
 };
 
 void CEXEBuild::print_help(char *commandname)
diff --git a/Source/tokens.h b/Source/tokens.h
index 12aa49e3..787abcf6 100644
--- a/Source/tokens.h
+++ b/Source/tokens.h
@@ -197,7 +197,7 @@ enum
   TOK_SECTIONGETFLAGS,
   TOK_SETSHELLVARCONTEXT,
   TOK_PLUGINDIR,
-  TOK_INITPLUGINDIR,
+  TOK_INITPLUGINSDIR,
   TOK_CREATEFONT,
   TOK_SHOWWINDOW,