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

Merge pull request #65845 from aaronfranke/unused-abort-scan

Browse Source 
Remove unused `abort_scan` variable
This commit is contained in:
Rémi Verschelde 2022-09-16 09:18:28 +02:00
commit f5b9a89109
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_file_system.cpp
View File

@ -690,7 +690,6 @@ void EditorFileSystem::scan() {
_update_extensions();
abort_scan = false;
if (!use_threads) {
scanning = true;
scan_total = 0;
@ -1162,8 +1161,6 @@ void EditorFileSystem::scan_changes() {
scanning_changes = true;
scanning_changes_done = false;
abort_scan = false;
if (!use_threads) {
if (filesystem) {
EditorProgressBG pr("sources", TTR("ScanSources"), 1000);
@ -1195,8 +1192,6 @@ void EditorFileSystem::_notification(int p_what) {
case NOTIFICATION_EXIT_TREE: {
Thread &active_thread = thread.is_started() ? thread : thread_sources;
if (use_threads && active_thread.is_started()) {
//abort thread if in progress
abort_scan = true;
while (scanning) {
OS::get_singleton()->delay_usec(1000);
}

1
editor/editor_file_system.h
View File

@ -168,7 +168,6 @@ class EditorFileSystem : public Node {
EditorFileSystemDirectory *new_filesystem = nullptr;
bool abort_scan = false;
bool scanning = false;
bool importing = false;
bool first_scan = true;