[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdelibs/khtml/html
From:       Germain Garand <germain () ebooksfrance ! com>
Date:       2006-04-02 22:33:46
Message-ID: 1144017226.401657.3813.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 525809 by ggarand:

always pop+merge the queue in notifyFinish as long as
we are asynchronous. We are leaving a nesting level.

BUG: 124716



 M  +3 -2      htmltokenizer.cpp  


--- branches/KDE/3.5/kdelibs/khtml/html/htmltokenizer.cpp #525808:525809
@@ -1739,10 +1739,11 @@
         // scriptHandler(). In that case scriptHandler() will take care
         // of 'scriptOutput'.
         if ( !script ) {
-            if (!done && pendingQueue.count() > 1) {
+            if (pendingQueue.count() > 1) {
                TokenizerString t = pendingQueue.pop();
                pendingQueue.top().prepend( t );
-            } else if (done) {
+            }
+            if (done) {
                 write(pendingQueue.pop(), false);
             }
             // we might be deleted at this point, do not
[prev in list] [next in list] [prev in thread] [next in thread]