aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2004-01-23 07:19:02 +0800
committerXan Lopez <xan@src.gnome.org>2004-01-23 07:19:02 +0800
commita3d35aec7cd2e6146d20efadf4c88b1a156d0e1b (patch)
treeba8a13f1eee6aa32f6d670ae3982dd200733c8a8
parent200d54ac01a9d4af824f9856c8a90daa786c1c2b (diff)
downloadgsoc2013-epiphany-a3d35aec7cd2e6146d20efadf4c88b1a156d0e1b.tar
gsoc2013-epiphany-a3d35aec7cd2e6146d20efadf4c88b1a156d0e1b.tar.gz
gsoc2013-epiphany-a3d35aec7cd2e6146d20efadf4c88b1a156d0e1b.tar.bz2
gsoc2013-epiphany-a3d35aec7cd2e6146d20efadf4c88b1a156d0e1b.tar.lz
gsoc2013-epiphany-a3d35aec7cd2e6146d20efadf4c88b1a156d0e1b.tar.xz
gsoc2013-epiphany-a3d35aec7cd2e6146d20efadf4c88b1a156d0e1b.tar.zst
gsoc2013-epiphany-a3d35aec7cd2e6146d20efadf4c88b1a156d0e1b.zip
Make Cancel safe against non active downloads.
* embed/mozilla/MozDownload.cpp: Make Cancel safe against non active downloads.
-rw-r--r--ChangeLog6
-rw-r--r--embed/mozilla/MozDownload.cpp6
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 086b5cc5e..125284c18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-23 Xan Lopez <xan@gnome.org>
+
+ * embed/mozilla/MozDownload.cpp:
+
+ Make Cancel safe against non active downloads.
+
2004-01-23 Christian Persch <chpe@cvs.gnome.org>
* embed/ephy-embed.h:
diff --git a/embed/mozilla/MozDownload.cpp b/embed/mozilla/MozDownload.cpp
index 38b06d064..6808c0251 100644
--- a/embed/mozilla/MozDownload.cpp
+++ b/embed/mozilla/MozDownload.cpp
@@ -406,6 +406,12 @@ MozDownload::OnSecurityChange (nsIWebProgress *aWebProgress, nsIRequest *aReques
void
MozDownload::Cancel()
{
+ if (mDownloadState != EPHY_DOWNLOAD_DOWNLOADING &&
+ mDownloadState != EPHY_DOWNLOAD_PAUSED)
+ {
+ return;
+ }
+
if (mWebPersist)
{
mWebPersist->CancelSave ();