diff --git a/ChangeLog b/ChangeLog
index 509180932..d9ca3fe08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2001-03-06  Darin Adler  <darin@eazel.com>
+
+	reviewed by: John Sullivan <sullivan@eazel.com>
+
+	Fixed bug 7328 (info pages no longer work):
+	
+	* components/help/converters/gnome-info2html2/main.c: (main):
+	Fixed broken logic for handling both bzip and gzip.
+
+	Fixed case when you change "View As" before the view change is
+	complete.
+	
+	* src/nautilus-window-manage-views.c:
+	(nautilus_window_set_content_view): Stop the view change if you
+	make a change with the "View As" menu.
+
 Tue Mar 06 12:24:24 2001  George Lebl <jirka@5z.com>
 
 	Darin <darin@eazel.com> said that while this patch causes fungal
diff --git a/components/help/converters/gnome-info2html2/main.c b/components/help/converters/gnome-info2html2/main.c
index 63334df39..338139736 100644
--- a/components/help/converters/gnome-info2html2/main.c
+++ b/components/help/converters/gnome-info2html2/main.c
@@ -44,9 +44,9 @@ int
 main(int argc, char **argv)
 {
 	gzFile f = NULL;
+	int bz = 0;
 #ifdef HAVE_LIBBZ2
 	BZFILE *bf=NULL;
-	int bz = 0;
 #endif
 	char line[250];
 	poptContext ctx;
@@ -168,47 +168,57 @@ main(int argc, char **argv)
 	/* No need to store all nodes, etc since we let web server */
 	/* handle resolving tags!                                  */
 	for (;1 || !foundit || !requested_nodename;) {
-#ifdef HAVE_LIBBZ2	 
-	  if(bz && !bf) {
-	     if(args && args[curarg])
-	      {
-		bf = bzopen(args[curarg++], "r");
-		if(!f)
-		  break;
-		num_files_left = args[curarg]?1:0;
-		for(work_line_number = 0, bzread(bf, line, sizeof(line)); *line != INFO_COOKIE;
-		    bzread(bf, line, sizeof(line)), work_line_number++)
-		  /**/ ;
-	      }
-	    else
-	      break;
-	  }
-	  if(!bzread(bf, line, sizeof(line)))
+	  if(bz)
 	    {
-	      bzclose(bf);
-	      bf = NULL;
-	      continue;
-	    }	
+#ifdef HAVE_LIBBZ2
+	      if(!bf)
+		{
+		  if(args && args[curarg])
+		    {
+		      bf = bzopen(args[curarg++], "r");
+		      if(!f)
+			break;
+		      num_files_left = args[curarg]?1:0;
+		      for(work_line_number = 0, bzread(bf, line, sizeof(line)); *line != INFO_COOKIE;
+			  bzread(bf, line, sizeof(line)), work_line_number++)
+			/**/ ;
+		    }
+		  else
+		    break;
+		}
+	      if(!bzread(bf, line, sizeof(line)))
+		{
+		  bzclose(bf);
+		  bf = NULL;
+		  continue;
+		}
+#else
+	      g_assert_not_reached();
 #endif
-	  if(!f) {
-	    if(args && args[curarg])
-	      {
-		f = gzopen(args[curarg++], "r");
-		if(!f)
-		  break;
-		num_files_left = args[curarg]?1:0;
-		for(work_line_number = 0, gzgets(f, line, sizeof(line)); *line != INFO_COOKIE;
-		    gzgets(f, line, sizeof(line)), work_line_number++)
-		  /**/ ;
-	      }
-	    else
-	      break;
-	  }
-	  if(!gzgets(f, line, sizeof(line)))
+	    }
+	  else
 	    {
-	      gzclose(f);
-	      f = NULL;
-	      continue;
+	      if(!f)
+		{
+		  if(args && args[curarg])
+		    {
+		      f = gzopen(args[curarg++], "r");
+		      if(!f)
+			break;
+		      num_files_left = args[curarg]?1:0;
+		      for(work_line_number = 0, gzgets(f, line, sizeof(line)); *line != INFO_COOKIE;
+			  gzgets(f, line, sizeof(line)), work_line_number++)
+			/**/ ;
+		    }
+		  else
+		    break;
+		}
+	      if(!gzgets(f, line, sizeof(line)))
+		{
+		  gzclose(f);
+		  f = NULL;
+		  continue;
+		}
 	    }
 		
 	  work_line_number++;
diff --git a/src/nautilus-window-manage-views.c b/src/nautilus-window-manage-views.c
index 6d34727a7..c89eeef1f 100644
--- a/src/nautilus-window-manage-views.c
+++ b/src/nautilus-window-manage-views.c
@@ -1454,9 +1454,10 @@ nautilus_window_set_content_view (NautilusWindow *window,
 
 	g_return_if_fail (NAUTILUS_IS_WINDOW (window));
         g_return_if_fail (window->details->location != NULL);
-        g_return_if_fail (window->new_content_view == NULL);
 	g_return_if_fail (id != NULL);
 
+        end_location_change (window);
+
         if (nautilus_window_content_view_matches_iid (window, id->iid)) {
         	return;
         }