[gnome-commander] Fixed problem #602795 (file content search)

[Piotr Eljasiak <epiotr src gnome org>]

commit a50fdb149f7dc99731c7fa8c637255d66186a5f8
Author: PrzemysÅ?aw WesoÅ?ek <pwes o2 pl>
Date:   Mon Mar 1 20:22:03 2010 +0100

    Fixed problem #602795 (file content search)

 NEWS                           |    1 +
 doc/C/gnome-commander.xml      |    3 +++
 src/gnome-cmd-search-dialog.cc |    5 +++++
 3 files changed, 9 insertions(+), 0 deletions(-)
---
diff --git a/NEWS b/NEWS
index 2270ff9..2df6883 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,7 @@ gnome-commander 1.2.8.6
 ---------------
 
 Bug fixes:
+ * Fixed problem #602795 (file content search)
  * Fixed problem #609912 (build error with --as-needed)
 
 
diff --git a/doc/C/gnome-commander.xml b/doc/C/gnome-commander.xml
index 56146c6..cd6a6f6 100644
--- a/doc/C/gnome-commander.xml
+++ b/doc/C/gnome-commander.xml
@@ -6047,6 +6047,9 @@
                 <para>
                     <itemizedlist>
                         <listitem>
+                            <para>Fixed problem #602795 (file content search)</para>
+                        </listitem>
+                        <listitem>
                             <para>Fixed problem #609912 (build error with --as-needed)</para>
                         </listitem>
                     </itemizedlist>
diff --git a/src/gnome-cmd-search-dialog.cc b/src/gnome-cmd-search-dialog.cc
index 68d2e83..acfcf57 100644
--- a/src/gnome-cmd-search-dialog.cc
+++ b/src/gnome-cmd-search-dialog.cc
@@ -232,7 +232,12 @@ inline gboolean content_matches (GnomeCmdFile *f, SearchData *data)
         SearchFileData  *search_file = NULL;
 
         while ((search_file = read_search_file (data, search_file, f)) != NULL)
+        {
             ret = regexec (data->content_regex, data->search_mem, 1, &match, 0);
+            // stop on first match
+            if (ret != REG_NOMATCH)
+                break;
+        }
     }
 
     return ret != REG_NOMATCH;