From de9b2d890c3cc161a48eeba6f87dbc6bf4ad2186 Mon Sep 17 00:00:00 2001
From: dP <dp@dpointer.org>
Date: Wed, 17 Mar 2021 19:20:30 +0300
Subject: [PATCH] Don't crash when run with -d desync

---
 src/citymania/cm_saveload.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/citymania/cm_saveload.cpp b/src/citymania/cm_saveload.cpp
index 322345205c..b9422ca864 100644
--- a/src/citymania/cm_saveload.cpp
+++ b/src/citymania/cm_saveload.cpp
@@ -259,6 +259,9 @@ void DecodeSettings(BitIStream &bs, Settings &settings) {
 uint16 _last_client_version = 1512;
 
 static u8vector EncodeData() {
+    // Skip if game is not initialized for some reason (i.e. -d desync)
+    if (!_game) return {};
+
     BitOStream bs;
     bs.Reserve(1000);
     bs.WriteBytes(SAVEGAME_DATA_FORMAT_VERSION, 2);