[pan: 13/22] Fix merge issue
- From: Dominique Dumont <ddumont src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pan: 13/22] Fix merge issue
- Date: Sun, 18 Sep 2022 16:35:38 +0000 (UTC)
commit b2302a72d89b3da182f8a7c54c059fb0b747abb6
Author: Thomas Tanner <thosrtanner googlemail com>
Date: Mon Jul 4 20:28:22 2022 +0100
Fix merge issue
pan/tasks/decoder.cc | 6 ++++++
1 file changed, 6 insertions(+)
---
diff --git a/pan/tasks/decoder.cc b/pan/tasks/decoder.cc
index b5eb4a0..2cf9f16 100644
--- a/pan/tasks/decoder.cc
+++ b/pan/tasks/decoder.cc
@@ -39,6 +39,12 @@
namespace pan {
Decoder :: Decoder (WorkerPool& pool):
+ mark_read(false),
+ task(nullptr),
+ save_mode(TaskArticle::NONE),
+ options(TaskArticle::SAVE_AS),
+ percent(0.0),
+ num_scanned_files(0),
health(OK),
_worker_pool (pool),
_gsourceid (-1)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]