[Kita-svn] [2545] fix the regression, which cause a assertion failure

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2009年 8月 10日 (月) 06:11:56 JST


Revision: 2545
          http://sourceforge.jp/projects/kita/svn/view?view=rev&revision=2545
Author:   nogu
Date:     2009-08-10 06:11:55 +0900 (Mon, 10 Aug 2009)

Log Message:
-----------
fix the regression, which cause a assertion failure

Modified Paths:
--------------
    kita/branches/KITA-KDE4/kita/src/htmlpart.cpp

Modified: kita/branches/KITA-KDE4/kita/src/htmlpart.cpp
===================================================================
--- kita/branches/KITA-KDE4/kita/src/htmlpart.cpp	2009-08-09 13:46:00 UTC (rev 2544)
+++ kita/branches/KITA-KDE4/kita/src/htmlpart.cpp	2009-08-09 21:11:55 UTC (rev 2545)
@@ -336,7 +336,7 @@
         return false;
     if (!m_domtree)
         return false;
-	DatManager datManager(m_datUrl);
+    DatManager datManager(m_datUrl);
     if (datManager.getReadNum() == 0)
         return false;
 
@@ -1548,6 +1548,7 @@
         refNum2 = refNum;
     }
 
+    DatManager localDatManager(datUrl);
     /* another thread ? */
     if (datUrl.host() != m_datUrl.host() || datUrl.path() != m_datUrl.path()) {
 
@@ -1557,10 +1558,10 @@
 
         /* If idx file of datURL is not read, thread name cannot be obtained.
            so, create DatInfo if cache exists, and read idx file in DatInfo::DatInfo(). */
-        datManager.getDatInfoPointer();
+        localDatManager.getDatInfoPointer();
 
         /* get thread Name */
-        QString subName = datManager.threadName();
+        QString subName = localDatManager.threadName();
         if (!subName.isEmpty()) innerHTML += subName + "<br><br>";
 
         if (!refNum) refNum = refNum2 = 1;
@@ -1568,9 +1569,10 @@
 
     /* get HTML and show it */
     if (!refNum) return ;
-    innerHTML += datManager.getHtml(refNum, refNum2);
+    innerHTML += localDatManager.getHtml(refNum, refNum2);
 
-    if (!innerHTML.isEmpty()) showPopup(datUrl, innerHTML);
+    if (!innerHTML.isEmpty())
+        showPopup(datUrl, innerHTML);
 }
 
 




Kita-svn メーリングリストの案内
Back to archive index