From c1fa33327db8cc43a4c966edd094a17dfb133508 Mon Sep 17 00:00:00 2001 From: lilia Date: Mon, 24 Apr 2017 17:26:05 -0700 Subject: [PATCH] Allow multi-instance in development --- main.js | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/main.js b/main.js index 2c795e673..bb6fd8423 100644 --- a/main.js +++ b/main.js @@ -12,23 +12,25 @@ const shell = electron.shell; app.setAppUserModelId('org.whispersystems.signal-desktop') -var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) { - // Someone tried to run a second instance, we should focus our window - if (mainWindow) { - if (mainWindow.isMinimized()) mainWindow.restore(); - mainWindow.focus(); - } - return true; -}); - -if (shouldQuit) { - app.quit(); - return; -} - const package_json = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json'), 'utf-8')) const environment = package_json.environment || process.env.NODE_ENV || 'development'; +if (environment === 'production') { + var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) { + // Someone tried to run a second instance, we should focus our window + if (mainWindow) { + if (mainWindow.isMinimized()) mainWindow.restore(); + mainWindow.focus(); + } + return true; + }); + + if (shouldQuit) { + app.quit(); + return; + } +} + // Set environment vars to configure node-config before requiring it process.env.NODE_ENV = environment; process.env.NODE_CONFIG_DIR = path.join(__dirname, 'config');