@@ -21,7 +21,6 @@
 from core.version import VERSION
 #   Cvars
 from cvars import ConVar
-from cvars import cvar
 #   Engines
 from engines.server import server_game_dll
 #   Entities
@@ -52,6 +51,7 @@
 from _listeners import on_client_fully_connect_listener_manager
 from _listeners import on_client_put_in_server_listener_manager
 from _listeners import on_client_settings_changed_listener_manager
+from _listeners import on_convar_changed_listener_manager
 from _listeners import on_level_init_listener_manager
 from _listeners import on_level_shutdown_listener_manager
 from _listeners import on_network_id_validated_listener_manager
@@ -166,7 +166,6 @@
 listeners_logger = _sp_logger.listeners
 
 on_version_update_listener_manager = ListenerManager()
-on_convar_changed_listener_manager = ListenerManager()
 on_plugin_loaded_manager = ListenerManager()
 on_plugin_unloaded_manager = ListenerManager()
 on_plugin_loading_manager = ListenerManager()
@@ -600,14 +599,6 @@ def _on_level_shutdown():
     OnLevelEnd._level_initialized = False
 
 
-@PreHook(get_virtual_function(cvar, 'CallGlobalChangeCallbacks'))
-def _pre_call_global_change_callbacks(args):
-    """Called when a ConVar has been changed."""
-    convar = make_object(ConVar, args[1])
-    old_value = args[2]
-    on_convar_changed_listener_manager.notify(convar, old_value)
-
-
 def _pre_fire_output(args):
     """Called when an output is about to be fired."""
     if not on_entity_output_listener_manager:
 
@@ -30,6 +30,18 @@
 #include "listeners_manager.h"
 
 
+//-----------------------------------------------------------------------------
+// External variables.
+//-----------------------------------------------------------------------------
+extern ICvar* g_pCVar;
+
+
+//-----------------------------------------------------------------------------
+// Extern functions
+//-----------------------------------------------------------------------------
+extern CConVarChangedListenerManager* GetOnConVarChangedListenerManager();
+
+
 //-----------------------------------------------------------------------------
 // Adds a callable to the end of the CListenerManager vector.
 //-----------------------------------------------------------------------------
@@ -149,7 +161,38 @@ object CListenerManager::__getitem__(unsigned int index)
 
 void CListenerManager::clear()
 {
-	m_vecCallables.RemoveAll();
+	if (GetCount()) {
+		m_vecCallables.RemoveAll();
+		Finalize();
+	}
+}
+
+
+//-----------------------------------------------------------------------------
+// Convar changed callback.
+//-----------------------------------------------------------------------------
+void ConVarChangedCallback(IConVar* var, const char* pOldValue, float flOldValue)
+{
+	static CConVarChangedListenerManager* on_convar_changed_listener_manager = GetOnConVarChangedListenerManager();
+	CALL_LISTENERS_WITH_MNGR(on_convar_changed_listener_manager, ptr(static_cast<ConVar*>(var)), pOldValue);
+}
+
+
+//-----------------------------------------------------------------------------
+// Called when the first callback is being registered.
+//-----------------------------------------------------------------------------
+void CConVarChangedListenerManager::Initialize()
+{
+	g_pCVar->InstallGlobalChangeCallback(ConVarChangedCallback);
+}
+
+
+//-----------------------------------------------------------------------------
+// Called when the last callback is being unregistered.
+//-----------------------------------------------------------------------------
+void CConVarChangedListenerManager::Finalize()
+{
+	g_pCVar->RemoveGlobalChangeCallback(ConVarChangedCallback);
 }
 
 
 
@@ -33,6 +33,8 @@
 #include "utilities/wrap_macros.h"
 #include "utlvector.h"
 
+#include "convar.h"
+
 
 //-----------------------------------------------------------------------------
 // Helper macros.
@@ -99,6 +101,17 @@ class CListenerManager: public wrapper<CListenerManager>
 };
 
 
+//-----------------------------------------------------------------------------
+// CConVarChangedListenerManager class.
+//-----------------------------------------------------------------------------
+class CConVarChangedListenerManager: public CListenerManager
+{
+public:
+	virtual void Initialize();
+	virtual void Finalize();
+};
+
+
 //-----------------------------------------------------------------------------
 // Functions
 //-----------------------------------------------------------------------------
 
@@ -65,6 +65,12 @@ DEFINE_MANAGER_ACCESSOR(OnServerOutput)
 DEFINE_MANAGER_ACCESSOR(OnPlayerRunCommand)
 DEFINE_MANAGER_ACCESSOR(OnButtonStateChanged)
 
+static CConVarChangedListenerManager s_OnConVarChanged;
+CConVarChangedListenerManager* GetOnConVarChangedListenerManager()
+{
+	return &s_OnConVarChanged;
+}
+
 
 //-----------------------------------------------------------------------------
 // Forward declarations.
@@ -142,6 +148,8 @@ void export_listener_managers(scope _listeners)
 	_listeners.attr("on_client_put_in_server_listener_manager") = object(ptr(GetOnClientPutInServerListenerManager()));
 	_listeners.attr("on_client_settings_changed_listener_manager") = object(ptr(GetOnClientSettingsChangedListenerManager()));
 
+	_listeners.attr("on_convar_changed_listener_manager") = object(ptr((CListenerManager *)GetOnConVarChangedListenerManager()));
+
 	_listeners.attr("on_level_init_listener_manager") = object(ptr(GetOnLevelInitListenerManager()));
 	_listeners.attr("on_level_shutdown_listener_manager") = object(ptr(GetOnLevelShutdownListenerManager()));
 
 
@@ -111,6 +111,7 @@ extern ICvar* g_pCVar;
 extern void InitCommands();
 extern void ClearAllCommands();
 extern PLUGIN_RESULT DispatchClientCommand(edict_t *pEntity, const CCommand &command);
+extern CConVarChangedListenerManager* GetOnConVarChangedListenerManager();
 
 //-----------------------------------------------------------------------------
 // The plugin is a static singleton that is exported as an interface
@@ -397,6 +398,9 @@ void CSourcePython::Unload( void )
 	DevMsg(1, MSG_PREFIX "Shutting down python...\n");
 	g_PythonManager.Shutdown();
 
+	DevMsg(1, MSG_PREFIX "Clearing convar changed listener...\n");
+	GetOnConVarChangedListenerManager()->clear();
+
 	DevMsg(1, MSG_PREFIX "Unhooking all functions...\n");
 	GetHookManager()->UnhookAllFunctions();