From fc648d8a919c1e28e0bb40e0679e729935579e55 Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Tue, 9 Feb 2021 00:48:44 +0100
Subject: [PATCH] [MIRROR] Fixes that painting asset runtime that happens every
 time. (#3210)

* Fixes that painting asset runtime that happens every time. (#56746)

Painting titles are not guaranteed to be unique, especially between categories.

* Fixes that painting asset runtime that happens every time.

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
---
 code/modules/asset_cache/asset_list_items.dm    |  3 ++-
 tgui/packages/tgui/interfaces/PortraitPicker.js | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm
index 49ed12c0e33..62bcf6e0288 100644
--- a/code/modules/asset_cache/asset_list_items.dm
+++ b/code/modules/asset_cache/asset_list_items.dm
@@ -488,7 +488,8 @@
 		var/list/portrait = p
 		var/png = "data/paintings/[tab]/[portrait["md5"]].png"
 		if(fexists(png))
-			assets[portrait["title"]] = png
+			var/asset_name = "[tab]_[portrait["md5"]]"
+			assets[asset_name] = png
 	..() //this is where it registers all these assets we added to the list
 
 /datum/asset/simple/portraits/library
diff --git a/tgui/packages/tgui/interfaces/PortraitPicker.js b/tgui/packages/tgui/interfaces/PortraitPicker.js
index b3e91a19b6c..59b9b227046 100644
--- a/tgui/packages/tgui/interfaces/PortraitPicker.js
+++ b/tgui/packages/tgui/interfaces/PortraitPicker.js
@@ -15,19 +15,23 @@ export const PortraitPicker = (props, context) => {
   const TABS = [
     {
       name: 'Common Portraits',
+      asset_prefix: "library",
       list: library,
     },
     {
       name: 'Secure Portraits',
+      asset_prefix: "library_secure",
       list: library_secure,
     },
     {
       name: 'Private Portraits',
+      asset_prefix: "library_private",
       list: library_private,
     },
   ];
   const tab2list = TABS[tabIndex].list;
-  const current_portrait = tab2list[listIndex]["title"];
+  const current_portrait_title = tab2list[listIndex]["title"];
+  const current_portrait_asset_name = TABS[tabIndex].asset_prefix + "_" + tab2list[listIndex]["md5"];
   return (
     <Window
       theme="ntos"
@@ -62,7 +66,7 @@ export const PortraitPicker = (props, context) => {
                 direction="column">
                 <Flex.Item>
                   <img
-                    src={resolveAsset(current_portrait)}
+                    src={resolveAsset(current_portrait_asset_name)}
                     height="96px"
                     width="96px"
                     style={{
@@ -71,7 +75,7 @@ export const PortraitPicker = (props, context) => {
                     }} />
                 </Flex.Item>
                 <Flex.Item className="Section__titleText">
-                  {current_portrait}
+                  {current_portrait_title}
                 </Flex.Item>
               </Flex>
             </Section>