Merge branch 'main' of github.com:Polyfrost/OneLauncher

Polyfrost · Sep 17, 2024 · 2ed2891 · 2ed2891
2 parents a1c7649 + c0ac142
commit 2ed2891
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/apps/frontend/src/ui/components/content/FormattedLog.tsx b/apps/frontend/src/ui/components/content/FormattedLog.tsx
@@ -1,8 +1,8 @@
-import type { Ref } from '@solid-primitives/refs';
-import type { OnUpdatedEventListenerArgs, OverlayScrollbars } from 'overlayscrollbars';
-import { AlignBottom01Icon } from '@untitled-theme/icons-solid';
+import { ChevronDownDoubleIcon } from '@untitled-theme/icons-solid';
 import { OverlayScrollbarsComponent, type OverlayScrollbarsComponentRef } from 'overlayscrollbars-solid';
 import { createEffect, createMemo, createSignal, Index, Show, untrack } from 'solid-js';
+import type { Ref } from '@solid-primitives/refs';
+import type { OnUpdatedEventListenerArgs, OverlayScrollbars } from 'overlayscrollbars';
 import Button from '../base/Button';
 import styles from './FormattedLog.module.scss';
 
@@ -47,7 +47,7 @@ function FormattedLog(props: FormattedLogProps) {
 					<Button.Toggle
 						buttonStyle="icon"
 						checked={shouldScroll}
-						children={<AlignBottom01Icon />}
+						children={<ChevronDownDoubleIcon />}
 						class="h-full! rounded-md! py-1!"
 						onChecked={toggleAutoScroll}
 					/>

diff --git a/apps/frontend/src/ui/components/content/ProviderIcon.tsx b/apps/frontend/src/ui/components/content/ProviderIcon.tsx
@@ -1,6 +1,6 @@
-import type { ManagedPackage, Providers } from '@onelauncher/client/bindings';
 import ModrinthImage from '~assets/logos/modrinth.svg?component-solid';
 import { type Component, type JSX, Match, Show, splitProps, Switch } from 'solid-js';
+import type { ManagedPackage, Providers } from '@onelauncher/client/bindings';
 
 export function getProviderLogoElement(provider: ManagedPackage | Providers): string | Component {
 	const providerName = (typeof provider === 'string' ? provider : provider.provider)?.toLowerCase() as Lowercase<Providers>;

diff --git a/packages/core/src/store/processor.rs b/packages/core/src/store/processor.rs
@@ -449,9 +449,9 @@ impl Processor {
 		#[cfg(target_os = "linux")]
 		{
 			if enable_gamemode.is_some_and(|x| x == true) {
-				// TODO: maybe just ignore the error...?
-				onelauncher_gamemode::request_start_for_wrapper(pid)
-					.map_err(|e| anyhow::anyhow!("failed to enable gamemode: {e}"))?;
+				if let Err(err) = onelauncher_gamemode::request_start_for_wrapper(pid) {
+					tracing::warn!("failed to enable gamemode, continuing: {}", err);
+				};
 			}
 		}