demo banner injection fixes

Author: FaserF

src/switchcraft/gui_modern/app.py

@@ -635,7 +635,7 @@ def setup_page(self):
         self.dev_banner_container = ft.Container()
 
         # Demo Banner
-        if IS_DEMO:
+        if IS_DEMO or SwitchCraftConfig.is_demo_mode():
              self.banner_container = ft.Container(
                 content=ft.Row(
                     [

src/switchcraft/main.py

@@ -460,6 +460,10 @@ def legacy_show_snack(snack):
     except Exception:
         pass
 
+    # --- Initialize Global App State ---
+    import switchcraft
+    switchcraft.IS_DEMO = SwitchCraftConfig.is_demo_mode()
+
     page.theme_mode = ft.ThemeMode.SYSTEM
     page.padding = 0
     page.spacing = 0

src/switchcraft/utils/config.py

@@ -672,6 +672,12 @@ def is_debug_mode(cls) -> bool:
         if os.environ.get("SWITCHCRAFT_DEBUG") == "1": return True
         return cls.get_value("DebugMode", 0) == 1
 
+    @classmethod
+    def is_demo_mode(cls) -> bool:
+        """Check if demo mode is enabled via config or CLI."""
+        if '--demo' in sys.argv: return True
+        return cls.get_value("DemoMode", 0) == 1 or cls.get_value("demo_mode", False) == True
+
     @classmethod
     def get_update_channel(cls) -> str:
         return cls.get_value("UpdateChannel", "stable")

switchcraft.iss

@@ -225,8 +225,8 @@ var
   ErrorCode: Integer;
 begin
   Result := True;
-  // Silently kill the process if it's running
-  Exec('taskkill.exe', '/F /IM {#MyAppExeName} /T', '', SW_HIDE, ewWaitUntilTerminated, ErrorCode);
+  // Silently kill the process only if it's running from the installation directory (avoids killing portable versions)
+  Exec('powershell.exe', '-ExecutionPolicy Bypass -WindowStyle Hidden -Command "Get-Process -Name ' + Copy('{#MyAppExeName}', 1, Pos('.exe', LowerCase('{#MyAppExeName}')) - 1) + ' -ErrorAction SilentlyContinue | Where-Object { $_.Path -like ''' + ExpandConstant('{app}') + '\*'' } | Stop-Process -Force"', '', SW_HIDE, ewWaitUntilTerminated, ErrorCode);
 
   // Check for /FULLCLEANUP parameter
   FullCleanupParam := False;

switchcraft_legacy.iss

@@ -207,8 +207,8 @@ var
   ErrorCode: Integer;
 begin
   Result := True;
-  // Silently kill the process if it's running
-  Exec('taskkill.exe', '/F /IM {#MyAppExeName} /T', '', SW_HIDE, ewWaitUntilTerminated, ErrorCode);
+  // Silently kill the process only if it's running from the installation directory (avoids killing portable versions)
+  Exec('powershell.exe', '-ExecutionPolicy Bypass -WindowStyle Hidden -Command "Get-Process -Name ' + Copy('{#MyAppExeName}', 1, Pos('.exe', LowerCase('{#MyAppExeName}')) - 1) + ' -ErrorAction SilentlyContinue | Where-Object { $_.Path -like ''' + ExpandConstant('{app}') + '\*'' } | Stop-Process -Force"', '', SW_HIDE, ewWaitUntilTerminated, ErrorCode);
 
   // Check for /FULLCLEANUP parameter
   FullCleanupParam := False;