Finder tweaks

Author: robbiebyrd

src/app/Applications/News/News.tsx

@@ -243,7 +243,6 @@ const News: React.FC = () => {
                                         {entry.title}
                                     </h1>
                                 </a>
-                                <br />
                                 <span
                                     style={{
                                         fontFamily: 'var(--ui-font)',

src/app/SystemFolder/ControlPanels/AppManager/ClassicyAppManager.ts

@@ -194,13 +194,12 @@ export const classicyAppEventHandler = (ds: ClassicyStore, action) => {
         }
         case 'ClassicyAppClose': {
             handler.closeApp(ds, action.app.id)
-            const lastOpenApp = () => {
-                const openApps = Object.values(ds.System.Manager.App.apps).find((value) => {
-                    return value.open === true
-                })
-                return openApps[0]?.id
+            const lastOpenApp = Object.values(ds.System.Manager.App.apps).find((value) => {
+                return value.open === true
+            })
+            if (lastOpenApp) {
+                handler.focusApp(ds, lastOpenApp.id)
             }
-            handler.focusApp(ds, lastOpenApp())
             break
         }
         case 'ClassicyAppFocus': {

src/app/SystemFolder/Finder/Finder.tsx

@@ -20,6 +20,8 @@ const Finder = () => {
     const [pathSettings, setPathSettings] = useState<Record<string, PathSettingsProps>>({})
     const [showAbout, setShowAbout] = useState(false)
 
+    const { openPaths } = desktop.System.Manager.App.apps[appId]?.data || {}
+
     useEffect(() => {
         const appData = desktop.System.Manager.App.apps[appId]?.data || {}
         if (!appData?.hasOwnProperty('openPaths')) {
@@ -121,8 +123,6 @@ const Finder = () => {
         )
     }
 
-    const { openPaths } = desktop.System.Manager.App.apps[appId]?.data || {}
-
     return (
         <ClassicyApp
             id={appId}

src/app/SystemFolder/SystemResources/Desktop/ClassicyDesktopIcon.tsx

@@ -97,6 +97,13 @@ const ClassicyDesktopIcon: React.FC<ClassicyDesktopIconProps> = ({
     let thisLocation = getIconLocation()
 
     const isLaunched = () => {
+        // Check if a Finder window is open
+        if (appId.startsWith('Finder.app')) {
+            const a = desktopContext.System.Manager.App.apps['Finder.app'].windows.findIndex(
+                (w) => w.id === eventData.path && w.closed === false
+            )
+            return a >= 0
+        }
         return desktopContext.System.Manager.App.apps[appId]?.open
     }