diff options
| author |  Fabio Bas | 2011-06-24 10:49:56 +0000 |
|---|---|---|
| committer | Fabio Bas | 2011-06-24 10:49:56 +0000 |
| commit | 4e5269c658bdfde8949083adb5a6b784bc81c8dc (patch) | |
| tree | cb46889bc553cfff7aaaab49bb2641cc66dd78da /src/modules/chan/libkvichan.cpp | |
| parent | murder typo spotted by TheRipper (diff) | |
| download | KVIrc-4e5269c658bdfde8949083adb5a6b784bc81c8dc.tar.gz KVIrc-4e5269c658bdfde8949083adb5a6b784bc81c8dc.tar.bz2 KVIrc-4e5269c658bdfde8949083adb5a6b784bc81c8dc.zip | |
fixed $chan.common when used outside a channel (eg, in the OnNickChange event)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5877 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/chan/libkvichan.cpp')
| -rw-r--r-- | src/modules/chan/libkvichan.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp index 50ac8a84e..25c031840 100644 --- a/src/modules/chan/libkvichan.cpp +++ b/src/modules/chan/libkvichan.cpp @@ -1816,17 +1816,23 @@ static bool chan_kvs_fnc_userlastactiontime(KviKvsModuleFunctionCall * c) */ static bool chan_kvs_fnc_common(KviKvsModuleFunctionCall * c) { - QString szNick, szContext, szChans; + QString szNick, szChans; + kvs_uint_t iContextId; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("nickname",KVS_PT_STRING,0,szNick) - KVSM_PARAMETER("context id",KVS_PT_STRING,KVS_PF_OPTIONAL,szContext) + KVSM_PARAMETER("context_id",KVS_PT_UINT,KVS_PF_OPTIONAL,iContextId) \ KVSM_PARAMETERS_END(c) - - KviChannelWindow * pChannel = chan_kvs_find_channel(c,szContext); - if(pChannel) + + KviConsoleWindow * pConsole = NULL; + if(c->parameterCount() > 1) + pConsole = g_pApp->findConsole(iContextId); + else + pConsole = c->window()->console(); + + if(pConsole && pConsole->connection()) { - pChannel->connection()->getCommonChannels(szNick,szChans,false); + pConsole->connection()->getCommonChannels(szNick,szChans,false); c->returnValue()->setString(szChans); } |