mirror of
https://github.com/hydralauncher/hydra.git
synced 2025-03-09 15:40:26 +00:00
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:
commit
981116f221
24 changed files with 142 additions and 154 deletions
|
@ -122,7 +122,7 @@ export function HeroPanelActions() {
|
|||
<Button
|
||||
onClick={() => setShowGameOptionsModal(true)}
|
||||
theme="outline"
|
||||
disabled={deleting || isGameRunning}
|
||||
disabled={deleting}
|
||||
className={styles.heroPanelAction}
|
||||
>
|
||||
<GearIcon />
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue