aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules
diff options
context:
space:
mode:
authorGravatar Fabio Bas2009-12-18 09:42:18 +0000
committerGravatar Fabio Bas2009-12-18 09:42:18 +0000
commitbabc5f919e1c8977bd87985c6c84c646c0b99e9b (patch)
tree4f0868befc612b4c1a0035eda1a21657dc6d3d9c /src/modules
parentfix for #651 (diff)
downloadKVIrc-babc5f919e1c8977bd87985c6c84c646c0b99e9b.tar.gz
KVIrc-babc5f919e1c8977bd87985c6c84c646c0b99e9b.tar.bz2
KVIrc-babc5f919e1c8977bd87985c6c84c646c0b99e9b.zip
fix for #649
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@3707 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/logview/logviewmdiwindow.cpp8
-rw-r--r--src/modules/logview/logviewmdiwindow.h3
2 files changed, 6 insertions, 5 deletions
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index b9c97df7a..9eeff7e44 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -157,11 +157,11 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
g_pApp->getLocalKvircDirectory(m_szLogDirectory,KviApp::Log);
KviQString::ensureLastCharIs(m_szLogDirectory,'/'); // Does this work on Windows?
- cacheFileList();
- setupItemList();
+ //avoid to execute the long time-consuming procedure of log indexing here:
+ //we could still be inside the context of the "Browse log files" QAction
+ QTimer::singleShot( 0, this, SLOT(cacheFileList()) );
}
-
KviLogViewMDIWindow::~KviLogViewMDIWindow()
{
g_pLogViewWindow = 0;
@@ -318,6 +318,8 @@ void KviLogViewMDIWindow::cacheFileList()
if(fi.suffix()=="gz" || fi.suffix()=="log")
m_logList.append(new KviLogFile(szFname));
}
+
+ setupItemList();
}
void KviLogViewMDIWindow::itemSelected(QTreeWidgetItem * it,QTreeWidgetItem *)
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 9cc1d368e..c2be960cb 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -122,8 +122,6 @@ protected:
QStringList getFileNames();
void setupItemList();
- void cacheFileList();
-
virtual QPixmap * myIconPtr();
virtual void resizeEvent(QResizeEvent *e);
virtual void keyPressEvent(QKeyEvent *e);
@@ -135,6 +133,7 @@ protected slots:
void itemSelected(QTreeWidgetItem * it, QTreeWidgetItem *);
void deleteCurrent();
void applyFilter();
+ void cacheFileList();
};
#endif //_LOGVIEWMDIWINDOW_H_