Fixed a bug in dpip when dillo aborts a running dpi connection

http://lists.auriga.wearlab.de/pipermail/dillo-dev/2012-December/009668.html

3 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 629d5de6..12e88e72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,7 @@ dillo-3.0.3 [not released yet]
 +- After focusing option menu, keypress will seek to next one beginning with
    that character.
  - When active tab is closed, focus the last one visited or opened.
+ - Fixed a bug in dpip when dillo aborts a running dpi connection.
    Patches: Jorge Arellano Cid
 +- Better window titles.
    Patch: Jeremy Henty
diff --git a/dpip/dpip.c b/dpip/dpip.c
index 170e4a88..dd97ec4a 100644
--- a/dpip/dpip.c
+++ b/dpip/dpip.c
@@ -451,8 +451,9 @@ char *a_Dpip_dsh_read_token(Dsh *dsh, int blocking)
          }
 
       } else if (dsh->mode & DPIP_RAW) {
-         /* Wait for data when the buffer is empty and there's no EOF yet */
-         while (dsh->rdbuf->len == 0 && dsh->status != DPIP_EOF)
+         /* Wait for data when the buffer is empty and there's no ERR/EOF */
+         while (dsh->rdbuf->len == 0 && 
+                dsh->status != DPIP_ERROR && dsh->status != DPIP_EOF)
             Dpip_dsh_read(dsh, 1);
       }
    }
diff --git a/src/uicmd.cc b/src/uicmd.cc
index d97744ca..0007813f 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -993,7 +993,8 @@ void a_UIcmd_save_link(BrowserWindow *bw, const DilloUrl *url)
    a_UIcmd_set_save_dir(prefs.save_dir);
 
    SuggestedName = UIcmd_make_save_filename(URL_STR(url));
-   if ((name = a_Dialog_save_file("Dillo: Save Link as File", NULL, SuggestedName))) {
+   name = a_Dialog_save_file("Dillo: Save Link as File", NULL, SuggestedName);
+   if (name) {
       MSG("a_UIcmd_save_link: %s\n", name);
       a_Nav_save_url(bw, url, name);
    }