[w3m-dev 03056] DISPLAY_IMAGE, STOP_IMAGE don't work.

* main.c (dispI): fix DISPLAY_IMAGE
* main.c (stopI): fix STOP_IMAGE
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>

2 files changed, 17 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index bf8edda..31b9a88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-15  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
+	* [w3m-dev 03056] DISPLAY_IMAGE, STOP_IMAGE don't work.
+	* main.c (dispI): fix DISPLAY_IMAGE
+	* main.c (stopI): fix STOP_IMAGE
+
 2002-02-14  Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
 
 	* [w3m-dev 03055] LIB_DIR -> w3m_lib_dir()
@@ -2938,4 +2944,4 @@
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.318 2002/02/14 03:50:03 ukai Exp $
+$Id: ChangeLog,v 1.319 2002/02/14 15:10:29 ukai Exp $
diff --git a/main.c b/main.c
index c88c9e0..852de83 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.82 2002/02/13 17:24:24 ukai Exp $ */
+/* $Id: main.c,v 1.83 2002/02/14 15:10:30 ukai Exp $ */
 #define MAINPROGRAM
 #include "fm.h"
 #include <signal.h>
@@ -4541,14 +4541,12 @@ dispI(void)
 	initImage();
     if (!activeImage)
 	return;
-    if (!displayImage || Currentbuf->image_flag == IMG_FLAG_SKIP) {
-	displayImage = TRUE;
-	if (!(Currentbuf->type && !strcmp(Currentbuf->type, "text/html")))
-	    return;
-	Currentbuf->image_flag = IMG_FLAG_AUTO;
-	Currentbuf->need_reshape = TRUE;
-	displayBuffer(Currentbuf, B_REDRAW_IMAGE);
-    }
+    displayImage = TRUE;
+    if (!(Currentbuf->type && !strcmp(Currentbuf->type, "text/html")))
+	return;
+    Currentbuf->image_flag = IMG_FLAG_AUTO;
+    Currentbuf->need_reshape = TRUE;
+    displayBuffer(Currentbuf, B_REDRAW_IMAGE);
 }
 
 void
@@ -4556,8 +4554,10 @@ stopI(void)
 {
     if (!activeImage)
 	return;
+    if (!(Currentbuf->type && !strcmp(Currentbuf->type, "text/html")))
+	return;
     Currentbuf->image_flag = IMG_FLAG_SKIP;
-    displayBuffer(Currentbuf, B_NORMAL);
+    displayBuffer(Currentbuf, B_REDRAW_IMAGE);
 }
 #endif