godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Remove unused abort_scan variable

Browse Source
This commit is contained in:
Aaron Franke
2022-09-15 14:23:38 -05:00
parent c2babb6558
commit 2be9ef507a
2 changed files with 0 additions and 6 deletions
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(); _update_extensions();
abort_scan = false;
if (!use_threads) { if (!use_threads) {
scanning = true; scanning = true;
scan_total = 0; scan_total = 0;
@@ -1162,8 +1161,6 @@ void EditorFileSystem::scan_changes() {
scanning_changes = true; scanning_changes = true;
scanning_changes_done = false; scanning_changes_done = false;
abort_scan = false;
if (!use_threads) { if (!use_threads) {
if (filesystem) { if (filesystem) {
EditorProgressBG pr("sources", TTR("ScanSources"), 1000); EditorProgressBG pr("sources", TTR("ScanSources"), 1000);
@@ -1195,8 +1192,6 @@ void EditorFileSystem::_notification(int p_what) {
case NOTIFICATION_EXIT_TREE: { case NOTIFICATION_EXIT_TREE: {
Thread &active_thread = thread.is_started() ? thread : thread_sources; Thread &active_thread = thread.is_started() ? thread : thread_sources;
if (use_threads && active_thread.is_started()) { if (use_threads && active_thread.is_started()) {
//abort thread if in progress
abort_scan = true;
while (scanning) { while (scanning) {
OS::get_singleton()->delay_usec(1000); 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; EditorFileSystemDirectory *new_filesystem = nullptr;
bool abort_scan = false;
bool scanning = false; bool scanning = false;
bool importing = false; bool importing = false;
bool first_scan = true; bool first_scan = true;