From 1fa65fc7d985aac9db77c5d14b94e9e9055ea229 Mon Sep 17 00:00:00 2001
From: Robert Zenz <Robert.Zenz@bonsaimind.org>
Date: Sat, 19 Dec 2015 12:18:07 +0100
Subject: [PATCH] Fixed naming collision.

---
 doc/index.html                     | 6 +++---
 mods/auto_hud_hide/autohudhide.lua | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/index.html b/doc/index.html
index 09979ea..b36c1b5 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -95,7 +95,7 @@
 <h2><a href="#Fields">Fields</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#activate">activate</a></td>
+	<td class="name" nowrap><a href="#activate_automatically">activate_automatically</a></td>
 	<td class="summary">If the system should be activated automatically.</td>
 	</tr>
 	<tr>
@@ -306,8 +306,8 @@
     <h2><a name="Fields"></a>Fields</h2>
     <dl class="function">
     <dt>
-    <a name = "activate"></a>
-    <strong>activate</strong>
+    <a name = "activate_automatically"></a>
+    <strong>activate_automatically</strong>
     </dt>
     <dd>
     If the system should be activated automatically.
diff --git a/mods/auto_hud_hide/autohudhide.lua b/mods/auto_hud_hide/autohudhide.lua
index 4e3ea61..99f9b9f 100644
--- a/mods/auto_hud_hide/autohudhide.lua
+++ b/mods/auto_hud_hide/autohudhide.lua
@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 --- A system which automatically hides hud items if there are no changes.
 autohudhide = {
 	--- If the system should be activated automatically.
-	activate = settings.get_bool("autohudhide_activate", true),
+	activate_automatically = settings.get_bool("autohudhide_activate", true),
 	
 	--- If the system is currently active/has been activated.
 	active = false,
@@ -57,7 +57,7 @@ autohudhide = {
 --- Activates the system, if it has not been deactivated in the configuration
 -- by settings autohudhide_activate to false.
 function autohudhide.activate()
-	if autohudhide.activate then
+	if autohudhide.activate_automatically then
 		autohudhide.activate_internal()
 	end
 end