Fixed naming collision.

master
Robert Zenz 2015-12-19 12:13:47 +01:00
parent 4e0ecdd03e
commit d8e558aaed
2 changed files with 5 additions and 5 deletions

View File

@ -115,7 +115,7 @@
<h2><a href="#Fields">Fields</a></h2> <h2><a href="#Fields">Fields</a></h2>
<table class="function_list"> <table class="function_list">
<tr> <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> <td class="summary">If the system should be activated automatically.</td>
</tr> </tr>
<tr> <tr>
@ -428,8 +428,8 @@
<h2><a name="Fields"></a>Fields</h2> <h2><a name="Fields"></a>Fields</h2>
<dl class="function"> <dl class="function">
<dt> <dt>
<a name = "activate"></a> <a name = "activate_automatically"></a>
<strong>activate</strong> <strong>activate_automatically</strong>
</dt> </dt>
<dd> <dd>
If the system should be activated automatically. If the system should be activated automatically.

View File

@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-- The only function that should be called from clients is activate. -- The only function that should be called from clients is activate.
spawnusher = { spawnusher = {
--- If the system should be activated automatically. --- If the system should be activated automatically.
activate = settings.get_bool("spawnusher_activate", true), activate_automatically = settings.get_bool("spawnusher_activate", true),
--- If the system is active/has been activated. --- If the system is active/has been activated.
active = false, active = false,
@ -90,7 +90,7 @@ spawnusher = {
--- Activates the spawn usher system, if it has not been deactivated by --- Activates the spawn usher system, if it has not been deactivated by
-- a seeting in the configuration. -- a seeting in the configuration.
function spawnusher.activate() function spawnusher.activate()
if spawnusher.activate then if spawnusher.activate_automatically then
spawnusher.activate_internal() spawnusher.activate_internal()
end end
end end