thePR0M3TH3AN/VoxVera
1
0
Fork 0
mirror of https://github.com/PR0M3TH3AN/VoxVera.git synced 2025-09-08 23:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into codex/start-onionshare-and-generate-static-site

Browse Source
This commit is contained in:
thePR0M3TH3AN
2025-06-21 15:57:04 -04:00
committed by GitHub
parent cb3b08ce82 524d074d36
commit 9e6591f7ac
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/electron/main.js
View File

@@ -6,6 +6,7 @@ const fs = require('fs');
let mainWindow; let mainWindow;
let onionProc; let onionProc;
// 🔧 merged conflicting changes from codex/start-onionshare-and-generate-static-site vs main
let restarting = false; let restarting = false;
function createWindow() { function createWindow() {
@@ -19,6 +20,7 @@ function createWindow() {
mainWindow.loadFile('index.html'); mainWindow.loadFile('index.html');
} }
// 🔧 merged conflicting changes from codex/start-onionshare-and-generate-static-site vs main
function startOnionShare() { function startOnionShare() {
const configPath = getConfigPath(); const configPath = getConfigPath();
const voxveraPath = which.sync('voxvera', { nothrow: true }); const voxveraPath = which.sync('voxvera', { nothrow: true });