eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2188 from Manindra29/findReplaceILfix

Browse Source 
Fixes #2082, Find Replace infinite loop
This commit is contained in:
Ben Fry
2014-01-21 17:05:47 -08:00
parent 334965f764 2cf37e4911
commit fd9a417246
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/FindReplace.java
+15 -2
View File
@@ -454,9 +454,22 @@ public class FindReplace extends JFrame {
editor.setSelection(0, 0);
boolean foundAtLeastOne = false;
while (true) {
int startTab = -1, startIndex = -1, c = 50000;
// you couldn't seriously be replacing 50K times o_O
while (--c > 0) {
if (find(false, false)) {
foundAtLeastOne = true;
if(editor.getSketch().getCurrentCodeIndex() == startTab
&& editor.getSelectionStart() == startIndex){
// we've reached where we started, so stop the replace
Toolkit.beep();
editor.statusNotice("Reached beginning of search!");
break;
}
if(!foundAtLeastOne){
foundAtLeastOne = true;
startTab = editor.getSketch().getCurrentCodeIndex();
startIndex = editor.getSelectionStart();
}
replace();
} else {
break;