Skip to content

Commit

Permalink
Merge pull request #322 from alliedmodders/fix-coreconf-order
Browse files Browse the repository at this point in the history
Fix CoreConfig init to happen after SMGlobalClasses from logic bin are added (r=asherkin).
  • Loading branch information
psychonic committed Apr 5, 2015
2 parents b84114b + 6c6ed24 commit 8ff1a9d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions core/sourcemod.cpp
Expand Up @@ -172,9 +172,6 @@ bool SourceModBase::InitializeSourceMod(char *error, size_t maxlength, bool late
return false;
}

/* Initialize CoreConfig to get the SourceMod base path properly - this parses core.cfg */
g_CoreConfig.Initialize();

/* There will always be a path by this point, since it was force-set above. */
m_GotBasePath = true;

Expand Down Expand Up @@ -256,6 +253,9 @@ void SourceModBase::StartSourceMod(bool late)

InitLogicBridge();

/* Initialize CoreConfig to get the SourceMod base path properly - this parses core.cfg */
g_CoreConfig.Initialize();

/* Notify! */
SMGlobalClass *pBase = SMGlobalClass::head;
while (pBase)
Expand Down

0 comments on commit 8ff1a9d

Please sign in to comment.