diff options
| author |  Fabio Bas | 2012-05-27 17:21:30 +0000 |
|---|---|---|
| committer | Fabio Bas | 2012-05-27 17:21:30 +0000 |
| commit | 3b7632f9a3d03c308eaf0292303d0a7275cc9769 (patch) | |
| tree | f09e764016945d2f89c2c613dfe8921f464532c8 /src/modules/dcc/DccDescriptor.cpp | |
| parent | added a note on installing kvirc under win vista/seven with UAC (diff) | |
| download | KVIrc-3b7632f9a3d03c308eaf0292303d0a7275cc9769.tar.gz KVIrc-3b7632f9a3d03c308eaf0292303d0a7275cc9769.tar.bz2 KVIrc-3b7632f9a3d03c308eaf0292303d0a7275cc9769.zip | |
fix #1289
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6170 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/dcc/DccDescriptor.cpp')
| -rw-r--r-- | src/modules/dcc/DccDescriptor.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/modules/dcc/DccDescriptor.cpp b/src/modules/dcc/DccDescriptor.cpp index cd50ac319..fc53b9901 100644 --- a/src/modules/dcc/DccDescriptor.cpp +++ b/src/modules/dcc/DccDescriptor.cpp @@ -98,18 +98,12 @@ DccDescriptor::~DccDescriptor() if(m_bCreationEventTriggered) { KviWindow * pEventWindow = m_pConsole; - if(!pEventWindow)pEventWindow = g_pApp->activeConsole(); // any console - else { - if(!(g_pApp->windowExists(pEventWindow)))pEventWindow = g_pApp->activeConsole(); - } + if(!pEventWindow || !(g_pApp->windowExists(pEventWindow))) + pEventWindow = g_pApp->activeConsole(); // any console - if(pEventWindow) + if(pEventWindow && g_pApp->windowExists(pEventWindow)) { - // recheck it again... - if(g_pApp->windowExists(pEventWindow)) - { - KVS_TRIGGER_EVENT_1(KviEvent_OnDCCSessionDestroyed,pEventWindow,m_szId); - } + KVS_TRIGGER_EVENT_1(KviEvent_OnDCCSessionDestroyed,pEventWindow,m_szId); } } @@ -133,9 +127,12 @@ void DccDescriptor::triggerCreationEvent() return; } m_bCreationEventTriggered = true; + KviWindow * pEventWindow = m_pConsole; - if(!pEventWindow)pEventWindow = g_pApp->activeConsole(); // any console - if(pEventWindow) + if(!pEventWindow || !(g_pApp->windowExists(pEventWindow))) + pEventWindow = g_pApp->activeConsole(); // any console + + if(pEventWindow && g_pApp->windowExists(pEventWindow)) { KVS_TRIGGER_EVENT_1(KviEvent_OnDCCSessionCreated,pEventWindow,m_szId); } |