mirror of
https://github.com/hydralauncher/hydra.git
synced 2026-01-11 13:56:16 +00:00
fix: merging conflict
This commit is contained in:
@@ -17,6 +17,7 @@ import {
|
||||
Lock,
|
||||
DeckyPlugin,
|
||||
DownloadSourcesChecker,
|
||||
WSClient,
|
||||
} from "@main/services";
|
||||
import { migrateDownloadSources } from "./helpers/migrate-download-sources";
|
||||
|
||||
@@ -60,7 +61,8 @@ export const loadState = async () => {
|
||||
|
||||
// Check for new download options on startup
|
||||
DownloadSourcesChecker.checkForChanges();
|
||||
// WSClient.connect();
|
||||
|
||||
WSClient.connect();
|
||||
});
|
||||
|
||||
const downloads = await downloadsSublevel
|
||||
|
||||
@@ -5,10 +5,12 @@ import type { LibraryGame } from "@types";
|
||||
|
||||
export interface LibraryState {
|
||||
value: LibraryGame[];
|
||||
searchQuery: string;
|
||||
}
|
||||
|
||||
const initialState: LibraryState = {
|
||||
value: [],
|
||||
searchQuery: "",
|
||||
};
|
||||
|
||||
export const librarySlice = createSlice({
|
||||
@@ -36,6 +38,9 @@ export const librarySlice = createSlice({
|
||||
game.newDownloadOptionsCount = undefined;
|
||||
}
|
||||
},
|
||||
setLibrarySearchQuery: (state, action: PayloadAction<string>) => {
|
||||
state.searchQuery = action.payload;
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
@@ -43,4 +48,5 @@ export const {
|
||||
setLibrary,
|
||||
updateGameNewDownloadOptions,
|
||||
clearNewDownloadOptions,
|
||||
setLibrarySearchQuery,
|
||||
} = librarySlice.actions;
|
||||
|
||||
Reference in New Issue
Block a user