Fix: Opening OpenComic multiple times creates new instances instead of opening a new window

Author: ollm

scripts/main.js

@@ -37,29 +37,9 @@ function createWindow(options = {}) {
 	let sendInitData = false;
 
 	let gotSingleInstanceLock = app.requestSingleInstanceLock();
-	if(!gotSingleInstanceLock)
-	{
-		let _toOpenFile = false;
-
-		const len = args.length;
-		const last = args[len - 1];
-
-		if(/^opencomic:\/\//.test(last))
-			app.quit();
-
-		for(let i = 1; i < len; i++)
-		{
-			let arg = args[i];
 
-			if(arg && !['--no-sandbox', 'scripts/main.js', '.dist/main.js', '.', '--new-window'].includes(arg) && !/^--/.test(arg) && !/app\.asar/i.test(arg) && fs.existsSync(arg))
-			{
-				_toOpenFile = arg;
-				break;
-			}
-		}
-
-		if(_toOpenFile && !newWindow) app.quit();
-	}
+	if(!gotSingleInstanceLock)
+		app.quit();
 
 	let mainWindowState = windowStateKeeper({
 		defaultWidth: 1100,

scripts/opencomic.js

@@ -171,10 +171,12 @@ electronRemote.app.on('second-instance', function(event, argv) {
 			}
 
 			openComic(arg, true);
-			break;
+			return;
 		}
 	}
 
+	openEmptyNewWindow();
+
 });
 
 function registreOpenUrl()
@@ -351,6 +353,7 @@ electron.ipcRenderer.on('init-data', function(event, data) {
 });
 
 let historyFromStartApp = false;
+let emptyNewWindow = false;
 
 async function loadFromHistory()
 {
@@ -378,6 +381,7 @@ async function startApp()
 
 	const args = [...process.argv, ...electronRemote.process.argv];
 
+	emptyNewWindow = args.includes('--empty-new-window');
 	let toOpenFileMainPath = getArgValue(args, '--main-path', false);
 	toOpenFile = toOpenFile || getArgValue(args, '--path', false);
 
@@ -415,7 +419,7 @@ async function startApp()
 
 		let lastReading = false;
 
-		if(config.startInContinueReading)
+		if(config.startInContinueReading && !emptyNewWindow)
 		{
 			let readingProgress = relative.get('readingProgress');
 			let highest = 0;
@@ -480,7 +484,7 @@ async function startApp()
 			}
 		}
 
-		if(!config.restoreTabsFromLastSession || !tabs?.tabs?.length || (tabs.tabs.length === 1 && !config.showAlwaysTabsBar))
+		if(emptyNewWindow || !config.restoreTabsFromLastSession || !tabs?.tabs?.length || (tabs.tabs.length === 1 && !config.showAlwaysTabsBar))
 		{
 			if(lastReading && fs.existsSync(lastReading.mainPath))
 				dom.openComic(false, lastReading.path, lastReading.mainPath);
@@ -582,6 +586,12 @@ async function openPathInNewWindow(path, mainPath = '', history = null, options
 	return await openNewWindow(['--path='+path, '--new-window', '--window-x='+x, '--window-y='+y, '--window-width='+width, '--window-height='+height, '--main-path='+mainPath, '--init-history=true'], {initHistory: history, ...options});
 }
 
+async function openEmptyNewWindow()
+{
+	const {x, y, width, height} = electronRemote.getCurrentWindow().getBounds();
+	return await openNewWindow(['--empty-new-window', '--new-window', '--window-x='+x, '--window-y='+y, '--window-width='+width, '--window-height='+height], {});
+}
+
 function openPathInNewTab(path, mainPath = '')
 {
 	const tabId = tabs.openPath(path, mainPath);

scripts/tabs/restore.mts

@@ -7,6 +7,7 @@ declare const config: any;
 declare const storage: any;
 declare const template: any;
 declare const handlebarsContext: any;
+declare const emptyNewWindow: boolean;
 /* eslint-enable @typescript-eslint/no-explicit-any */
 
 interface TabSaved {
@@ -58,7 +59,7 @@ function save(throttle: boolean = true, updateActive: boolean = false): void {
 
 function restore(openLastActiveTab: boolean = false): void {
 
-	if(!config.restoreTabsFromLastSession)
+	if(!config.restoreTabsFromLastSession || emptyNewWindow)
 		return;
 
 	const data = storage.get('tabs');