From 9a03783f491505940a20d006055a5427bf364807 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Fri, 18 Oct 2013 23:35:38 +0200
Subject: - tooltip on download list now contains the file name - bugfix: when
 refreshing the directory tree conflict information wasn't immediately
 refreshed (including on start) - bugfix: dataChanged events wasn't emitted
 when user changed the modlist - bugfix: file patterns in checkfnis plugin
 weren't completely correct

---
 src/modinfo.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/modinfo.cpp')

diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 9bc013f1..8d672675 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -324,6 +324,7 @@ ModInfoRegular::ModInfoRegular(const QDir &path, DirectoryEntry **directoryStruc
     }
   }
 
+
   QString categoriesString = metaFile.value("category", "").toString();
 
   QStringList categories = categoriesString.split(',', QString::SkipEmptyParts);
@@ -589,6 +590,11 @@ void ModInfoRegular::endorse(bool doEndorse)
   }
 }
 
+void ModInfoRegular::clearCaches()
+{
+  m_LastConflictCheck = QTime();
+}
+
 
 QString ModInfoRegular::absolutePath() const
 {
@@ -690,7 +696,7 @@ ModInfoRegular::EConflictType ModInfoRegular::isConflicted() const
 {
   // this is costy so cache the result
   QTime now = QTime::currentTime();
-  if (abs(m_LastConflictCheck.secsTo(now)) > 10) {
+  if (m_LastConflictCheck.isNull() || (m_LastConflictCheck.secsTo(now) > 10)) {
     bool overwrite = false;
     bool overwritten = false;
     bool regular = false;
-- 
cgit v1.3.1