Author: rgheck
Date: Sun Jan 22 15:23:43 2012
New Revision: 40651
URL: http://www.lyx.org/trac/changeset/40651

Log:
Backport Tommaso's fix for #7410: Weird stale selection leads
to assertion after replace all.

Modified:
   lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/FindAndReplace.cpp
   lyx-devel/branches/BRANCH_2_0_X/status.20x

Modified: lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/FindAndReplace.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/FindAndReplace.cpp        
Sun Jan 22 15:13:13 2012        (r40650)
+++ lyx-devel/branches/BRANCH_2_0_X/src/frontends/qt4/FindAndReplace.cpp        
Sun Jan 22 15:23:43 2012        (r40651)
@@ -328,7 +328,8 @@
                                continue;
                        view_.setBusy(false);
                        return true;
-               }
+               } else if (replace_all)
+                       bv->clearSelection();
 
                // No match found in current buffer (however old selection 
might have been replaced)
                // select next buffer in scope, if any

Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x  Sun Jan 22 15:13:13 2012        
(r40650)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x  Sun Jan 22 15:23:43 2012        
(r40651)
@@ -215,6 +215,8 @@
 
 * ADVANCED FIND AND REPLACE
 
+- Fix crash with Replace All (bug 7410).
+
 
 * BUILD/INSTALLATION
 

Reply via email to