mirror of
https://github.com/debauchee/barrier.git
synced 2025-06-22 12:37:01 +02:00
merged 1.4 r1007:1008 into trunk
This commit is contained in:
parent
bebf8c2c2c
commit
5a315324ca
39 changed files with 808 additions and 2854 deletions
|
@ -289,7 +289,7 @@ CServerApp::loadConfig(const CString& pathname)
|
|||
CEvent::Type
|
||||
CServerApp::getReloadConfigEvent()
|
||||
{
|
||||
return CEvent::registerTypeOnce(s_reloadConfigEvent, "reloadConfig");
|
||||
return EVENTQUEUE->registerTypeOnce(s_reloadConfigEvent, "reloadConfig");
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -303,13 +303,13 @@ CServerApp::forceReconnect(const CEvent&, void*)
|
|||
CEvent::Type
|
||||
CServerApp::getForceReconnectEvent()
|
||||
{
|
||||
return CEvent::registerTypeOnce(s_forceReconnectEvent, "forceReconnect");
|
||||
return EVENTQUEUE->registerTypeOnce(s_forceReconnectEvent, "forceReconnect");
|
||||
}
|
||||
|
||||
CEvent::Type
|
||||
CServerApp::getResetServerEvent()
|
||||
{
|
||||
return CEvent::registerTypeOnce(s_resetServerEvent, "resetServer");
|
||||
return EVENTQUEUE->registerTypeOnce(s_resetServerEvent, "resetServer");
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue