- Extended Page size meter to include images.

3 files changed, 4 insertions, 11 deletions

diff --git a/src/cache.c b/src/cache.c
index 29829964..dcc8802d 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -1084,6 +1084,8 @@ static void Cache_process_queue(CacheEntry_t *entry)
          if ((Client->BufSize = data->len) > 0) {
             Client->Buf = data->str;
             (Client->Callback)(CA_Send, Client);
+            if (ClientWeb->flags & WEB_RootUrl)
+               a_UIcmd_set_page_prog(Client_bw, data->len, 1);
          }
 
          /* Remove client when done */
@@ -1092,6 +1094,8 @@ static void Cache_process_queue(CacheEntry_t *entry)
             int flags = ClientWeb->flags;
             /* We finished sending data, let the client know */
             (Client->Callback)(CA_Close, Client);
+            if (ClientWeb->flags & WEB_RootUrl)
+               a_UIcmd_set_page_prog(Client_bw, 0, 0);
             Cache_client_dequeue(Client, NULLKey);
             --i; /* Keep the index value in the next iteration */
 
diff --git a/src/html.cc b/src/html.cc
index 7986c168..cc8aab43 100644
--- a/src/html.cc
+++ b/src/html.cc
@@ -617,9 +617,6 @@ void DilloHtml::write(char *Buf, int BufSize, int Eof)
    Start_Buf = Buf;
    token_start = Html_write_raw(this, buf, bufsize, Eof);
    Start_Ofs += token_start;
-
-   if (bw)
-      a_UIcmd_set_page_prog(bw, Start_Ofs, 1);
 }
 
 /*
@@ -674,9 +671,6 @@ void DilloHtml::finishParsing(int ClientKey)
    /* Remove this client from our active list */
    a_Bw_close_client(bw, ClientKey);
 
-   /* Set progress bar insensitive */
-   a_UIcmd_set_page_prog(bw, 0, 0);
-
    freeParseData();
    parse_finished = true;
 }
diff --git a/src/plain.cc b/src/plain.cc
index 3f2c6399..9a656907 100644
--- a/src/plain.cc
+++ b/src/plain.cc
@@ -191,9 +191,6 @@ void DilloPlain::write(void *Buf, uint_t BufSize, int Eof)
    }
 
    DW2TB(dw)->flush();
-
-   if (bw)
-      a_UIcmd_set_page_prog(bw, Start_Ofs, 1);
 }
 
 /*
@@ -228,8 +225,6 @@ static void Plain_callback(int Op, CacheClient_t *Client)
       plain->write(Client->Buf, Client->BufSize, 1);
       /* remove this client from our active list */
       a_Bw_close_client(plain->bw, Client->Key);
-      /* set progress bar insensitive */
-      a_UIcmd_set_page_prog(plain->bw, 0, 0);
    } else {
       plain->write(Client->Buf, Client->BufSize, 0);
    }