diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-25 21:12:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 21:12:14 +0200 |
| commit | eeee47196c19dc271d6fcf8981946a1a29efd16a (patch) | |
| tree | 24c683fb89c07dc38dcea3ed8e60d277a52517a1 /editor | |
| parent | aa6876df5068141014930052428df4bbbd549ca5 (diff) | |
| parent | 9fcf9ee813d792b3852cdb478f27f36ebae3b019 (diff) | |
Merge pull request #23262 from swenner/more-cppcheck-fixes
More cppcheck fixes, fixes #22702
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/progress_dialog.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/editor/progress_dialog.cpp b/editor/progress_dialog.cpp index 29a780961e..4a98aa411d 100644 --- a/editor/progress_dialog.cpp +++ b/editor/progress_dialog.cpp @@ -39,7 +39,7 @@ void BackgroundProgress::_add_task(const String &p_task, const String &p_label, _THREAD_SAFE_METHOD_ ERR_FAIL_COND(tasks.has(p_task)); - Task t; + BackgroundProgress::Task t; t.hb = memnew(HBoxContainer); Label *l = memnew(Label); l->set_text(p_label + " "); @@ -112,7 +112,7 @@ void BackgroundProgress::add_task(const String &p_task, const String &p_label, i void BackgroundProgress::task_step(const String &p_task, int p_step) { //this code is weird, but it prevents deadlock. - bool no_updates; + bool no_updates = true; { _THREAD_SAFE_METHOD_ no_updates = updates.empty(); @@ -167,7 +167,7 @@ void ProgressDialog::_popup() { void ProgressDialog::add_task(const String &p_task, const String &p_label, int p_steps, bool p_can_cancel) { ERR_FAIL_COND(tasks.has(p_task)); - Task t; + ProgressDialog::Task t; t.vb = memnew(VBoxContainer); VBoxContainer *vb2 = memnew(VBoxContainer); t.vb->add_margin_child(p_label, vb2); |