From e56b75d5f0b618892439fe34361bb1260c829596 Mon Sep 17 00:00:00 2001
From: Mike Goslin <mikegoslin@users.sourceforge.net>
Date: Wed, 20 Dec 2000 02:58:32 +0000
Subject: [PATCH] *** empty log message ***

---
 panda/src/downloader/downloader.I   | 6 ++++--
 panda/src/downloader/downloader.cxx | 2 ++
 panda/src/downloader/downloader.h   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/panda/src/downloader/downloader.I b/panda/src/downloader/downloader.I
index da8c278897..2e1cf09319 100644
--- a/panda/src/downloader/downloader.I
+++ b/panda/src/downloader/downloader.I
@@ -91,8 +91,10 @@ get_bytes_written(void) const {
       << "initiated" << endl;
     return 0.0;
   }
-  nassertr(_current_status != NULL, 0);
-  return _current_status->_total_bytes_written;
+  if (_current_status != NULL)
+    return _current_status->_total_bytes_written;
+  else
+    return _total_bytes_written;
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/downloader/downloader.cxx b/panda/src/downloader/downloader.cxx
index 0c697ddfe6..4153cfbb25 100644
--- a/panda/src/downloader/downloader.cxx
+++ b/panda/src/downloader/downloader.cxx
@@ -68,6 +68,7 @@ Downloader(void) {
   _initiated = false;
   _ever_initiated = false;
   _TCP_stack_initialized = false;
+  _total_bytes_written = 0;
 }
 
 ////////////////////////////////////////////////////////////////////
@@ -383,6 +384,7 @@ cleanup(void) {
   // connection when the download is complete
   _connected = false;
   _dest_stream.close();
+  _total_bytes_written = _current_status->_total_bytes_written;
   delete _current_status;
   _initiated = false;
 }
diff --git a/panda/src/downloader/downloader.h b/panda/src/downloader/downloader.h
index 227d28bc97..1774d2ada4 100644
--- a/panda/src/downloader/downloader.h
+++ b/panda/src/downloader/downloader.h
@@ -147,6 +147,7 @@ private:
 
   DownloadStatus *_current_status;
   bool _got_any_data;
+  int _total_bytes_written;
 
   double _tlast;
   double _tfirst;