muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
sanjayk03-dev
2024-03-29 04:52:50 +05:30
parent b33f1e9e16
commit 5ccb9e89dc
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/control-view.js
View File

@@ -405,7 +405,7 @@ module.exports = {
} }
const file = files[0]; const file = files[0];
if (this.state.files.includes(file.name)) { if (this.state.files.includes(file.name) && !this.config.macros_list.find(item => item.file_name == file.name)) {
this.showFileDuplicate = true; this.showFileDuplicate = true;
return; return;
} }
@@ -505,11 +505,12 @@ module.exports = {
return; return;
} }
const folderName = files[0].webkitRelativePath.split("/")[0]; const folderName = files[0].webkitRelativePath.split("/")[0];
console.log(files);
for (let file of files) { for (let file of files) {
console.log(file.name); if (
if (this.state.files.includes(file.name)) { this.state.files.includes(file.name) &&
!this.config.macros_list.find(item => item.file_name == file.name)
) {
this.showFileDuplicate = true; this.showFileDuplicate = true;
return; return;
} }