okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/ciderapp/Cider

Browse source
This commit is contained in:
vapormusic 2022-05-21 14:19:37 +07:00
commit 85820713d3
3 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
.circleci/config.yml
View file

@ -159,9 +159,9 @@ jobs:
- run: - run:
name: Fix Versioning and Add Channel name: Fix Versioning and Add Channel
command: yarn circle:script command: yarn circle:script
# - run: - run:
# name: Set App Version name: Set App Version
# command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV
- run: - run:
name: Publish Release name: Publish Release
command: | command: |

4
resources/circle.js
View file

@ -34,13 +34,13 @@ pkg.publish = {
const {exec} = require('child_process') const {exec} = require('child_process')
exec(`export APP_VERSION=${pkg.version} && echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { exec(`echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) {
console.log(stdout, stderr, error); console.log(stdout, stderr, error);
}); });
writeFile('package.json', JSON.stringify(pkg), err => { writeFile('package.json', JSON.stringify(pkg), err => {
// error checking // error checking
if (err) throw err; if (err) throw err;
console.log(`VERSION CHANGED TO ${pkg.version}`); console.log(`VERSION CHANGED TO ${pkg.version}`, pkg);
}); });

8
src/renderer/main/vueapp.js
View file

@ -818,7 +818,13 @@ const app = new Vue({
CiderAudio.audioNodes.gainNode.gain.value = gain CiderAudio.audioNodes.gainNode.gain.value = gain
} catch (e) { } } catch (e) { }
} }
} catch (e) { ipcRenderer.send('SoundCheckTag', event, tag); } // brute force until it works } catch (e) {
try { ipcRenderer.send('SoundCheckTag', event, tag); }
catch (e) {
try {ipcRenderer.send('SoundCheckTag', event, tag);}
catch (e) {console.log("[Cider][MaikiwiSoundCheck] Error [Gave up after 3 consecutive attempts]: " + e)}
}
} // brute force until it works
}) })
ipcRenderer.on('play', function (_event, mode, id) { ipcRenderer.on('play', function (_event, mode, id) {