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

Codeac hotfix #1045

Merged
merged 8 commits into from
Aug 22, 2021
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
15 changes: 12 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions src/app/desktop/utils/getInstances.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,13 @@ const getInstances = async instancesPath => {
return null;
};
const folders = await getDirectories(instancesPath);
const instances = await pMap(folders, mapFolderToInstance, {
concurrency: 5
});
const instances = await pMap(
folders.filter(folder => folder !== '.DS_Store'),
mapFolderToInstance,
{
concurrency: 5
}
);
const hashMap = {};
// eslint-disable-next-line
for (const instance of instances) {
Expand Down
10 changes: 7 additions & 3 deletions src/app/desktop/utils/modsFingerprintsScan.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,13 @@ const modsFingerprintsScan = async instancesPath => {
};

const folders = await getDirectories(instancesPath);
const instances = await pMap(folders, mapFolderToInstance, {
concurrency: 5
});
const instances = await pMap(
folders.filter(folder => folder !== '.DS_Store'),
mapFolderToInstance,
{
concurrency: 5
}
);
const hashMap = {};
// eslint-disable-next-line
for (const instance of instances) {
Expand Down
6 changes: 3 additions & 3 deletions src/common/modals/InstanceManager/Mods.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const NotItemsAvailable = styled.div`
const DragEnterEffect = styled.div`
position: absolute;
display: flex;
flex-direction; column;
flex-direction: column;
justify-content: center;
align-items: center;
border: solid 5px ${props => props.theme.palette.primary.main};
Expand All @@ -161,8 +161,8 @@ const DragEnterEffect = styled.div`
backdrop-filter: blur(4px);
background: linear-gradient(
0deg,
rgba(0, 0, 0, .3) 40%,
rgba(0, 0, 0, .3) 40%
rgba(0, 0, 0, 0.3) 40%,
rgba(0, 0, 0, 0.3) 40%
);
opacity: ${({ transitionState }) =>
transitionState === 'entering' || transitionState === 'entered' ? 1 : 0};
Expand Down
2 changes: 1 addition & 1 deletion src/common/modals/ModOverview.js
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ const Container = styled.div`
perspective: 1px;
transform-style: preserve-3d;
height: calc(100% - 70px);
width; 100%;
width: 100%;
overflow-x: hidden;
overflow-y: scroll;
`;
Expand Down
2 changes: 1 addition & 1 deletion src/common/modals/ModsBrowser.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ const ModsListWrapper = ({
<RowInnerContainer>
<RowContainerImg
style={{
background: `url('${primaryImage?.thumbnailUrl}') center center`
backgroundImage: `url('${primaryImage?.thumbnailUrl}')`
}}
/>
<div
Expand Down
6 changes: 5 additions & 1 deletion src/common/reducers/actions.js
Original file line number Diff line number Diff line change
Expand Up @@ -3016,7 +3016,11 @@ export const getAppLatestVersion = async () => {
if (!isAppUpdated(latestStablerelease)) {
return latestStablerelease;
}
if (!isAppUpdated(latestPrerelease) && releaseChannel !== 0) {
if (
latestPrerelease &&
!isAppUpdated(latestPrerelease) &&
releaseChannel !== 0
) {
return latestPrerelease;
}

Expand Down