Merge branch 'main' into hyd-228-investigate-why-users-are-being-logged-out-when-updating

# Conflicts:
#	src/main/events/user-preferences/auto-launch.ts
This commit is contained in:
Zamitto 2024-07-03 16:32:25 -03:00
commit 981116f221
24 changed files with 142 additions and 154 deletions

View file

@ -122,7 +122,7 @@ export function HeroPanelActions() {
<Button
onClick={() => setShowGameOptionsModal(true)}
theme="outline"
disabled={deleting || isGameRunning}
disabled={deleting}
className={styles.heroPanelAction}
>
<GearIcon />