Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add setting for allowing multiple concurrent instances #2089

Merged
merged 2 commits into from
Aug 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/main/gui/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ export const createGuiApp = (args: OpenArguments) => {
app.disableHardwareAcceleration();
}

const hasInstanceLock = app.requestSingleInstanceLock();
const isAllowMultipleInstances = settingStorage.getItem('allow-multiple-instances') === 'true';

const hasInstanceLock = isAllowMultipleInstances || app.requestSingleInstanceLock();
if (!hasInstanceLock) {
app.quit();
}
Expand Down
21 changes: 17 additions & 4 deletions src/renderer/components/SettingsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -684,12 +684,17 @@ const PythonSettings = memo(() => {
});

const AdvancedSettings = memo(() => {
const { useCheckUpdOnStrtUp, useExperimentalFeatures, useEnableHardwareAcceleration } =
useContext(SettingsContext);
const {
useCheckUpdOnStrtUp,
useExperimentalFeatures,
useEnableHardwareAcceleration,
useAllowMultipleInstances,
} = useContext(SettingsContext);
const [isCheckUpdOnStrtUp, setIsCheckUpdOnStrtUp] = useCheckUpdOnStrtUp;
const [isExperimentalFeatures, setIsExperimentalFeatures] = useExperimentalFeatures;
const [isEnableHardwareAcceleration, setIsEnableHardwareAcceleration] =
useEnableHardwareAcceleration;
const [isAllowMultipleInstances, setIsAllowMultipleInstances] = useAllowMultipleInstances;

return (
<VStack
Expand All @@ -706,20 +711,28 @@ const AdvancedSettings = memo(() => {
/>
<Toggle
description="Enable experimental features to try them out before they are finished."
title="Enable experimental features."
title="Enable experimental features"
value={isExperimentalFeatures}
onToggle={() => {
setIsExperimentalFeatures((prev) => !prev);
}}
/>
<Toggle
description="Enable GPU rendering for the GUI. Use with caution, as it may severely decrease GPU performance for image processing."
title="Enable Hardware Acceleration (requires restart)."
title="Enable Hardware Acceleration (requires restart)"
value={isEnableHardwareAcceleration}
onToggle={() => {
setIsEnableHardwareAcceleration((prev) => !prev);
}}
/>
<Toggle
description="Enable multiple concurrent instances of chaiNNer. This is not recommended, but if your chain is not using enough of your system resources, you might find this helpful for running things concurrently."
title="Allow multiple concurrent instances"
value={isAllowMultipleInstances}
onToggle={() => {
setIsAllowMultipleInstances((prev) => !prev);
}}
/>
</VStack>
);
});
Expand Down
5 changes: 5 additions & 0 deletions src/renderer/contexts/SettingsContext.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ interface Settings {
useExperimentalFeatures: GetSetState<boolean>;
useEnableHardwareAcceleration: GetSetState<boolean>;
useViewportExportPadding: GetSetState<number>;
useAllowMultipleInstances: GetSetState<boolean>;

// Node Settings
useNodeFavorites: GetSetState<readonly SchemaId[]>;
Expand Down Expand Up @@ -98,6 +99,9 @@ export const SettingsProvider = memo(({ children }: React.PropsWithChildren<unkn
const useEnableHardwareAcceleration = useMemoArray(
useLocalStorage('enable-hardware-acceleration', false)
);
const useAllowMultipleInstances = useMemoArray(
useLocalStorage('allow-multiple-instances', false)
);

const contextValue = useMemoObject<Settings>({
// GPU Stuff
Expand All @@ -121,6 +125,7 @@ export const SettingsProvider = memo(({ children }: React.PropsWithChildren<unkn
useExperimentalFeatures,
useEnableHardwareAcceleration,
useViewportExportPadding,
useAllowMultipleInstances,

// Node
useNodeFavorites,
Expand Down