commit 3b0276205d479e5950aa79ba112d144c2f92680a
parent 75e6810babbcd68a8ea66f88d380a6cda1973e20
Author: ukai <ukai>
Date: Wed, 6 Nov 2002 03:19:30 +0000
[w3m-dev 03375] NULL check of CurrentTab
* display.c (disp_message_nsec): check CurrentTab
* file.c (doExternal): check CurrentTab
* image.c (loadImage): check CurrentTab
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
Diffstat:
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2002-11-06 Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
+ * [w3m-dev 03375] NULL check of CurrentTab
+ * display.c (disp_message_nsec): check CurrentTab
+ * file.c (doExternal): check CurrentTab
+ * image.c (loadImage): check CurrentTab
+
2002-11-06 Fumitoshi UKAI <ukai@debian.or.jp>
* [w3m-dev 03374] disable_secret_security_check
diff --git a/display.c b/display.c
@@ -1047,7 +1047,7 @@ disp_message_nsec(char *s, int redraw_current, int sec, int purge, int mouse)
fprintf(stderr, "%s\n", conv_to_system(s));
return;
}
- if (Currentbuf != NULL)
+ if (CurrentTab != NULL && Currentbuf != NULL)
message(s, Currentbuf->cursorX + Currentbuf->rootX,
Currentbuf->cursorY + Currentbuf->rootY);
else
@@ -1062,7 +1062,7 @@ disp_message_nsec(char *s, int redraw_current, int sec, int purge, int mouse)
if (mouse && use_mouse)
mouse_inactive();
#endif
- if (Currentbuf != NULL && redraw_current)
+ if (CurrentTab != NULL && Currentbuf != NULL && redraw_current)
displayBuffer(Currentbuf, B_NORMAL);
}
diff --git a/file.c b/file.c
@@ -7113,7 +7113,7 @@ doExternal(URLFile uf, char *path, char *type, Buffer **bufp,
fmTerm();
mySystem(command->ptr, 0);
fmInit();
- if (Currentbuf)
+ if (CurrentTab && Currentbuf)
displayBuffer(Currentbuf, B_FORCE_REDRAW);
}
else {
diff --git a/image.c b/image.c
@@ -431,7 +431,7 @@ loadImage(int flag)
if (!stat(cache->file, &st)) {
cache->loaded = IMG_FLAG_LOADED;
if (getImageSize(cache)) {
- if (flag == IMG_FLAG_NEXT && Currentbuf)
+ if (flag == IMG_FLAG_NEXT && CurrentTab && Currentbuf)
Currentbuf->need_reshape = TRUE;
}
draw = TRUE;
@@ -443,7 +443,7 @@ loadImage(int flag)
}
if (flag == IMG_FLAG_NEXT && draw)
drawImage();
- if (Currentbuf)
+ if (CurrentTab && Currentbuf)
showImageProgress(Currentbuf);
}
@@ -466,7 +466,7 @@ loadImage(int flag)
}
image_list = NULL;
image_file = NULL;
- if (Currentbuf)
+ if (CurrentTab && Currentbuf)
displayBuffer(Currentbuf, B_NORMAL);
return;
}