From 6ee17e35ceb0dc1f4a1be749bd3d350d92ca9f88 Mon Sep 17 00:00:00 2001
From: LeJeu <64744459+le-jeu@users.noreply.github.com>
Date: Sun, 16 Jan 2022 22:05:36 +0100
Subject: [PATCH] fix: merged marked as unchanged

---
 src/code/model/changes.ts   | 1 +
 src/code/model/operation.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/code/model/changes.ts b/src/code/model/changes.ts
index 1e88b3838..5f2070c48 100644
--- a/src/code/model/changes.ts
+++ b/src/code/model/changes.ts
@@ -186,6 +186,7 @@ export function operationChanges(origin: WasabeeOp, current: WasabeeOp) {
       "comment",
       "referencetime",
       "color",
+      "localchanged",
     ]),
     portals: compareList(
       origin.opportals,
diff --git a/src/code/model/operation.ts b/src/code/model/operation.ts
index 2617249b2..b417f8a37 100644
--- a/src/code/model/operation.ts
+++ b/src/code/model/operation.ts
@@ -112,7 +112,7 @@ export default class WasabeeOp extends Evented implements IOperation {
     this.teamlist = obj.teamlist ? obj.teamlist : [];
     this.fetched = obj.fetched ? obj.fetched : null;
     this.stored = obj.stored ? obj.stored : null;
-    this.localchanged = obj.localchanged === false ? obj.localchanged : true;
+    this.localchanged = !!obj.localchanged;
     this.keysonhand = obj.keysonhand ? obj.keysonhand : [];
     this.zones = this.convertZonesToObjs(obj.zones);
     // this.modified = obj.modified ? obj.modified : null;