Fix issue #2279: Replace text issue

WinMerge · Apr 13, 2024 · d3ab50c · d3ab50c
1 parent dfd0f9b
commit d3ab50c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/Externals/crystaledit/editlib/ccrystaleditview.cpp b/Externals/crystaledit/editlib/ccrystaleditview.cpp
@@ -1574,13 +1574,6 @@ SaveLastSearch(LastSearchInfos *lastSearch)
   if (lastSearch->m_bNoWrap)
     m_dwLastReplaceFlags |= FIND_NO_WRAP;
 
-  //  Restore selection
-  if (m_bSelectionPushed)
-    {
-      SetSelection (m_ptSavedSelStart, m_ptSavedSelEnd);
-      m_bSelectionPushed = false;
-    }
-
   //  Save search parameters to registry
   VERIFY (AfxGetApp()->WriteProfileInt (EDITPAD_SECTION, _T ("ReplaceFlags"), m_dwLastReplaceFlags));
 }

diff --git a/Externals/crystaledit/editlib/dialogs/ceditreplacedlg.cpp b/Externals/crystaledit/editlib/dialogs/ceditreplacedlg.cpp
@@ -60,6 +60,7 @@ CEditReplaceDlg::CEditReplaceDlg (CCrystalEditView * pBuddy)
 , m_nDirection(1)
 , m_bEnableScopeSelection(true)
 , m_bFound(false)
+, m_bReplaced(false)
 , lastSearch({0})
 {
   ASSERT (pBuddy != nullptr);
@@ -153,6 +154,13 @@ OnCancel ()
   VERIFY (UpdateData ());
   CDialog::OnCancel ();
   m_pBuddy->SetFocus();
+  if (m_bReplaced)
+    {
+      //  Restore selection
+      if (m_pBuddy->m_bSelectionPushed)
+        m_pBuddy->SetSelection(m_pBuddy->m_ptSavedSelStart, m_pBuddy->m_ptSavedSelEnd);
+    }
+  m_pBuddy->m_bSelectionPushed = false;
 }
 
 BOOL CEditReplaceDlg::
@@ -417,7 +425,7 @@ OnEditReplace ()
     }
   m_bFound = DoHighlightText ( true );
 
-  m_pBuddy->SaveLastSearch(&lastSearch);
+  m_bReplaced = true;
 }
 
 void CEditReplaceDlg::
@@ -521,7 +529,7 @@ OnEditReplaceAll ()
 
   AfxMessageBox( strMessage, MB_ICONINFORMATION|MB_DONT_DISPLAY_AGAIN, IDS_NUM_REPLACED);
 
-  m_pBuddy->SaveLastSearch(&lastSearch);
+  m_bReplaced = true;
 }
 
 void CEditReplaceDlg::
@@ -563,6 +571,7 @@ void CEditReplaceDlg::
 UpdateLastSearch ()
 {
   SetLastSearch (m_sText, m_bMatchCase, m_bWholeWord, m_bRegExp, m_nScope, m_nDirection);
+  m_pBuddy->SaveLastSearch(&lastSearch);
 }
 
 void CEditReplaceDlg::

diff --git a/Externals/crystaledit/editlib/dialogs/ceditreplacedlg.h b/Externals/crystaledit/editlib/dialogs/ceditreplacedlg.h
@@ -44,6 +44,7 @@ class EDITPADC_CLASS CEditReplaceDlg : public CDialog
 private :
     CCrystalEditView * m_pBuddy;
     bool m_bFound;
+    bool m_bReplaced;
     CEPoint m_ptFoundAt;
     bool DoHighlightText ( bool bNotifyIfNotFound, bool bUpdateView = true );
     bool DoReplaceText (const tchar_t* pszNewText, findtext_flags_t dwSearchFlags);