aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Szymon Tomasz Stefanek2012-02-28 00:16:41 +0000
committerGravatar Szymon Tomasz Stefanek2012-02-28 00:16:41 +0000
commita9ee2019c33033d103292eda18a8f1d243c1897b (patch)
tree1eeb953fde041a5beed5d8824bdd4e67d4b7ddd8 /src
parentDon't crash at startup while loading modules with the verbose flag set (diff)
downloadKVIrc-a9ee2019c33033d103292eda18a8f1d243c1897b.tar.gz
KVIrc-a9ee2019c33033d103292eda18a8f1d243c1897b.tar.bz2
KVIrc-a9ee2019c33033d103292eda18a8f1d243c1897b.zip
Don't assert when we have no console window. It *may* happen.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6084 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
-rw-r--r--src/kvirc/ui/KviMainWindow.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp
index b7fd512c2..cc42d36fd 100644
--- a/src/kvirc/ui/KviMainWindow.cpp
+++ b/src/kvirc/ui/KviMainWindow.cpp
@@ -667,10 +667,13 @@ KviConsoleWindow * KviMainWindow::firstConsole()
{
for(KviWindow * wnd = m_pWinList->first();wnd;wnd = m_pWinList->next())
{
- if(wnd->type() == KviWindow::Console)return (KviConsoleWindow *)wnd;
+ if(wnd->type() == KviWindow::Console)
+ return (KviConsoleWindow *)wnd;
}
- KVI_ASSERT(false);
- return 0; //should newer be here!.. but sometimes we are ?
+
+ // We end up here when we have not console windows.
+ // This may happen at early startup or late before shutdown.
+ return NULL;
}
KviConsoleWindow * KviMainWindow::firstNotConnectedConsole()