godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19135 from Zylann/fix_find_in_files_2 

Fix potential bugs with Find in Files
This commit is contained in:
Rémi Verschelde 2018-05-25 11:37:04 +02:00 committed by GitHub
parent a830e633a2 6f6ee60e19
commit 0929caea82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/find_in_files.cpp
View File

@ -109,6 +109,7 @@ void FindInFiles::start() {
_current_dir = "";
PoolStringArray init_folder;
init_folder.append(_root_dir);
_folders_stack.clear();
_folders_stack.push_back(init_folder);
_initial_files_count = 0;
@ -127,11 +128,12 @@ void FindInFiles::_process() {
// This part can be moved to a thread if needed
OS &os = *OS::get_singleton();
float duration = 0.0;
while (duration < 1.0 / 120.0) {
float time_before = os.get_ticks_msec();
while (is_processing()) {
_iterate();
duration += (os.get_ticks_msec() - time_before);
float elapsed = (os.get_ticks_msec() - time_before);
if (elapsed > 1000.0 / 120.0)
break;
}
}