Fixed profiler being set to NULL (bug 4143, r=fyren).
authorDavid Anderson <dvander@alliedmods.net>
Mon Dec 14 23:08:15 2009 -0800 (2009-12-14)
changeset 28780e24b9d8abcb
parent 2877 e668ed09fbb4
child 2879 16c4fb1d4836
Fixed profiler being set to NULL (bug 4143, r=fyren).
core/logic/Profiler.h
core/logic/common_logic.cpp
     1.1 --- a/core/logic/Profiler.h	Mon Dec 14 23:07:54 2009 -0800
     1.2 +++ b/core/logic/Profiler.h	Mon Dec 14 23:08:15 2009 -0800
     1.3 @@ -126,6 +126,6 @@
     1.4  	prof_point_t m_ProfStart;
     1.5  };
     1.6  
     1.7 -extern ProfileEngine g_Profiler;
     1.8 +extern IProfiler *sm_profiler;
     1.9  
    1.10  #endif //_INCLUDE_SOURCEMOD_PLUGIN_PROFILER_H_
     2.1 --- a/core/logic/common_logic.cpp	Mon Dec 14 23:07:54 2009 -0800
     2.2 +++ b/core/logic/common_logic.cpp	Mon Dec 14 23:08:15 2009 -0800
     2.3 @@ -35,6 +35,7 @@
     2.4  #include "common_logic.h"
     2.5  #include "ThreadSupport.h"
     2.6  #include "TextParsers.h"
     2.7 +#include "Profiler.h"
     2.8  
     2.9  sm_core_t smcore;
    2.10  IHandleSys *handlesys;
    2.11 @@ -52,7 +53,8 @@
    2.12  static sm_logic_t logic =
    2.13  {
    2.14  	NULL,
    2.15 -	g_pThreader
    2.16 +	g_pThreader,
    2.17 +	sm_profiler
    2.18  };
    2.19  
    2.20  static void logic_init(const sm_core_t* core, sm_logic_t* _logic)