Skip to content

TagSpaces is an offline, open source, document manager with tagging support

fix thumb opening in file properties after .ts folder remove (#2273)

Stanimira16b5ef324b0
diff --git a/src/renderer/components/EntryProperties.tsx b/src/renderer/components/EntryProperties.tsx
index 17beda2ce..3ad1a0250 100644
--- a/src/renderer/components/EntryProperties.tsx
+++ b/src/renderer/components/EntryProperties.tsx
@@ -234,7 +234,7 @@ function EntryProperties(props: Props) {
useEffect(() => {
reloadBackground();
reloadThumbnails();
- }, [location]);
+ }, [openedEntry]); //location]);
useEffect(() => {
if (!firstRender && metaActions && metaActions.length > 0 && openedEntry) {
diff --git a/src/renderer/hooks/OpenedEntryContextProvider.tsx b/src/renderer/hooks/OpenedEntryContextProvider.tsx
index 38c6c1792..885b9989b 100644
--- a/src/renderer/hooks/OpenedEntryContextProvider.tsx
+++ b/src/renderer/hooks/OpenedEntryContextProvider.tsx
@@ -617,14 +617,17 @@ export const OpenedEntryContextProvider = ({
entryForOpening.url = fsEntry.url;
}
//set meta and generate new meta id if not exist
- let meta;
- if (fsEntry.meta && fsEntry.meta.id) {
- meta = { ...fsEntry.meta };
- } else {
- meta = await getMetadata(fsEntry.path, fsEntry.uuid, loc);
+ if (!fsEntry.meta || !fsEntry.meta.id) {
+ const meta: TS.FileSystemEntryMeta = await getMetadata(
+ fsEntry.path,
+ fsEntry.uuid,
+ loc,
+ );
+ if (meta) {
+ entryForOpening.uuid = meta.id;
+ entryForOpening.meta = { ...(fsEntry.meta || {}), ...meta };
+ }
}
- entryForOpening.uuid = meta.id;
- entryForOpening.meta = meta;
if (
fsEntry.isNewFile &&