anjuta r4075 - in trunk: . plugins/search

[jhs svn gnome org]

Author: jhs
Date: Thu Jul 10 07:09:35 2008
New Revision: 4075
URL: http://svn.gnome.org/viewvc/anjuta?rev=4075&view=rev

Log:
2008-07-10  Johannes Schmid  <jhs gnome org>

	Patch from Yuriy Penkin
	* plugins/search/search-replace.c (search_and_replace):
	#541941 â Crash on searching with regular expression

Modified:
   trunk/ChangeLog
   trunk/plugins/search/search-replace.c

Modified: trunk/plugins/search/search-replace.c
==============================================================================
--- trunk/plugins/search/search-replace.c	(original)
+++ trunk/plugins/search/search-replace.c	Thu Jul 10 07:09:35 2008
@@ -368,7 +368,7 @@
 		else /* if (SE_FILE == se->type) */
 			fb = file_buffer_new_from_path(se->path, NULL, -1, 0);
 
-		if (fb)
+		if (fb && fb->buf)
 		{		
 			fb->pos = se->start_pos;
 			offset = 0;
@@ -593,29 +593,15 @@
 				if (SA_SELECT == s->action ||
 					((SA_REPLACE == s->action || SA_REPLACEALL == s->action) && interactive))
 					break;
-			} // while
-/* NO - leave the current position unchanged when marking-all
-			if (nb_results > 0)
-			{
-				switch (s->action)
-				{
-					case SA_HIGHLIGHT:
-					case SA_BOOKMARK:
-						ianjuta_editor_goto_line (fb->te, found_line, NULL);
-					default:
-						break;
-				}
 			}
-*/
-		if (save_file)
-		{
+			if (save_file)
+			{
 				save_not_opened_files (fb);
-			save_file = FALSE;
+				save_file = FALSE;
+			}
+			
 		}
-		
-			file_buffer_free (fb);
-		}  // if (fb)
-
+		file_buffer_free (fb);
 		g_free (se->path);
 		g_free (se);