aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Ridgers <[email protected]>2021-10-26 10:37:26 +0200
committerMartin Ridgers <[email protected]>2021-10-26 10:37:26 +0200
commitf51ff97229b73c2066ae6cc0cb5b02b4d45499dc (patch)
tree04e723c53d5985c650a81883492eb3f772665e7f
parent'return std::move(local_object)' prevents copy elision (diff)
parentFixed crash at startup when updating manifest. (diff)
downloadzen-f51ff97229b73c2066ae6cc0cb5b02b4d45499dc.tar.xz
zen-f51ff97229b73c2066ae6cc0cb5b02b4d45499dc.zip
Merged main
-rw-r--r--zenserver/zenserver.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/zenserver/zenserver.cpp b/zenserver/zenserver.cpp
index 4cbb56915..de30c5425 100644
--- a/zenserver/zenserver.cpp
+++ b/zenserver/zenserver.cpp
@@ -561,7 +561,6 @@ ZenServer::InitializeState(ZenServiceConfig& ServiceConfig)
CbObjectWriter Cbo;
Cbo << "schema_version" << ZEN_SCHEMA_VERSION << "created" << Now << "updated" << Now << "state_id" << Oid::NewOid();
- Cbo << m_RootManifest["id"];
m_RootManifest = Cbo.Save();