From e0569525a29d677f62c36848b8d5790bc21abde0 Mon Sep 17 00:00:00 2001
From: Hide_D <hided62@gmail.com>
Date: Fri, 8 Jul 2022 22:57:19 +0900
Subject: [PATCH] fix

---
 hwe/ts/components/GeneralBasicCard.vue | 2 +-
 hwe/ts/components/MapCityDetail.vue    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hwe/ts/components/GeneralBasicCard.vue b/hwe/ts/components/GeneralBasicCard.vue
index 64f8ded..d4304ae 100644
--- a/hwe/ts/components/GeneralBasicCard.vue
+++ b/hwe/ts/components/GeneralBasicCard.vue
@@ -117,7 +117,7 @@
     <div>부대</div>
     <div v-if="!troopInfo" class="general-troop">-</div>
     <div v-else class="general-troop">
-      <s v-if="troopInfo.leader.reservedCommand[0]?.action != 'che_집합'" style="color: gray">
+      <s v-if="troopInfo.leader.reservedCommand && troopInfo.leader.reservedCommand[0].action != 'che_집합'" style="color: gray">
         {{ troopInfo.name }}
       </s>
       <span v-else style="color: orange">
diff --git a/hwe/ts/components/MapCityDetail.vue b/hwe/ts/components/MapCityDetail.vue
index 4283643..6cfc1d9 100644
--- a/hwe/ts/components/MapCityDetail.vue
+++ b/hwe/ts/components/MapCityDetail.vue
@@ -32,7 +32,7 @@
         <div :class="['city_filler', props.isMyCity ? 'my_city' : '']"></div>
 
         <div v-if="city.nationID && city.nationID > 0" class="city_flag">
-          <img :src="`${imagePath}/${city.supply ? 'f' : 'd'}${city.color.substring(1).toUpperCase()}.gif`" />
+          <img :src="`${imagePath}/${city.supply ? 'f' : 'd'}${unwrap(city.color).substring(1).toUpperCase()}.gif`" />
           <div v-if="city.isCapital" class="city_capital">
             <img :src="`${imagePath}/event51.gif`" />
           </div>
@@ -49,6 +49,7 @@
 <script lang="ts" setup>
 import type { MapCityParsed } from "@/map";
 import { ref, toRef, watch, type PropType } from "vue";
+import { unwrap } from "@/util/unwrap";
 const emit = defineEmits<{
   (event: "click", e: MouseEvent | TouchEvent): void;
   (event: "mouseenter", e: MouseEvent): void;