From 8503b2be4e94c8d0ca8718c3cc1b1fd1ff8789ad Mon Sep 17 00:00:00 2001
From: Fumitoshi UKAI <ukai@debian.or.jp>
Date: Wed, 6 Nov 2002 03:19:30 +0000
Subject: [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>

---
 ChangeLog | 9 ++++++++-
 display.c | 6 +++---
 file.c    | 4 ++--
 image.c   | 8 ++++----
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3b2f1e0..11394f9 100644
--- 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
@@ -4305,4 +4312,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.477 2002/11/05 17:54:38 ukai Exp $
+$Id: ChangeLog,v 1.478 2002/11/06 03:19:30 ukai Exp $
diff --git a/display.c b/display.c
index 6a971e5..ad84220 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.27 2002/11/05 17:12:02 ukai Exp $ */
+/* $Id: display.c,v 1.28 2002/11/06 03:19:30 ukai Exp $ */
 #include <signal.h>
 #include "fm.h"
 
@@ -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
index 94fac59..4c49564 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.111 2002/11/05 17:10:05 ukai Exp $ */
+/* $Id: file.c,v 1.112 2002/11/06 03:19:30 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -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
index dd6e8f3..71a7a47 100644
--- a/image.c
+++ b/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.12 2002/11/05 17:10:05 ukai Exp $ */
+/* $Id: image.c,v 1.13 2002/11/06 03:19:31 ukai Exp $ */
 
 #include "fm.h"
 #include <sys/types.h>
@@ -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;
 	    }
-- 
cgit v1.2.3