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

List:       kde-commits
Subject:    [kdelibs/KDE/4.13] kdewebkit: Handle "Cancel" in the file dialog correctly.
From:       David Faure <faure () kde ! org>
Date:       2014-03-05 9:50:44
Message-ID: E1WL8TM-0007ky-5G () scm ! kde ! org
[Download RAW message or body]

Git commit fa77b7702fb698ee0bc74e4818eb4060ca636848 by David Faure.
Committed on 05/03/2014 at 09:49.
Pushed by dfaure into branch 'KDE/4.13'.

Handle "Cancel" in the file dialog correctly.

It used to loop in the while(true) and keep popping up the dialog
over and over again.

No time to look up for bug reports on bugs.kde.org :/

CCMAIL: adawit@kde.org

M  +1    -1    kdewebkit/kwebpage.cpp

http://commits.kde.org/kdelibs/fa77b7702fb698ee0bc74e4818eb4060ca636848

diff --git a/kdewebkit/kwebpage.cpp b/kdewebkit/kwebpage.cpp
index 63fd293..04f5081 100644
--- a/kdewebkit/kwebpage.cpp
+++ b/kdewebkit/kwebpage.cpp
@@ -582,7 +582,7 @@ bool KWebPage::handleReply(QNetworkReply* reply, QStrin=
g* contentType, KIO::Meta
                             return true;
                     }
                     if (!downloadResource(replyUrl, suggestedFileName, d->=
windowWidget()))
-                        break;
+                        return true; // file dialog was cancelled, stop he=
re
                 }
                 return true;
             case KParts::BrowserOpenOrSaveQuestion::Cancel:
[prev in list] [next in list] [prev in thread] [next in thread]