Reviewed by Adele
authorkdecker <kdecker@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Jul 2005 17:50:50 +0000 (17:50 +0000)
committerkdecker <kdecker@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Jul 2005 17:50:50 +0000 (17:50 +0000)
Fixed: http://bugzilla.opendarwin.org/show_bug.cgi?id=4009
        Test cases added: none, doesn't affect layout

        * khtml/khtml_part.cpp:
        (KHTMLPart::scheduleLocationChange): Corrected an earlier mistake of testing an always non-zero constant.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9802 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog-2005-08-23
WebCore/khtml/khtml_part.cpp

index f9681077a88e9c71cf2fb73447a8b0b10a678102..619bae0fad07a50bf57141450139aaa220f53942 100644 (file)
@@ -1,3 +1,13 @@
+2005-07-15  Kevin Decker  <kdecker@apple.com>
+
+        Reviewed by Adele
+
+       Fixed: http://bugzilla.opendarwin.org/show_bug.cgi?id=4009
+        Test cases added: none, doesn't affect layout
+
+        * khtml/khtml_part.cpp:
+        (KHTMLPart::scheduleLocationChange): Corrected an earlier mistake of testing an always non-zero constant. 
+
 2005-07-14  John Sullivan  <sullivan@apple.com>
 
         Reviewed by Ken Kocienda (setFocusNode) and Dave Hyatt (everything).
index 5ee17a032bbc1f049b596b214df0f9f722313dd5..8b5f34e27af51b6a5e5c7a9fef25f098d9757df5 100644 (file)
@@ -2073,7 +2073,7 @@ void KHTMLPart::scheduleLocationChange(const QString &url, const QString &referr
     // If a redirect was scheduled during a load, then stop the current load.
     // Otherwise when the current load transitions from a provisional to a 
     // committed state, pending redirects may be cancelled. 
-    if (locationChangeScheduledDuringLoad) {
+    if (d->m_scheduledRedirection == locationChangeScheduledDuringLoad) {
         stopLoading(true);   
     }