From b103f297752b170ee4ade6e0e9085c6d31c020ca Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 18 Jul 2020 00:35:26 -0400
Subject: added --multiple to allow launching multiple instances

---
 src/singleinstance.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/singleinstance.cpp')

diff --git a/src/singleinstance.cpp b/src/singleinstance.cpp
index aa62d40a..d38095df 100644
--- a/src/singleinstance.cpp
+++ b/src/singleinstance.cpp
@@ -28,33 +28,38 @@ static const int s_Timeout = 5000;
 
 using MOBase::reportError;
 
-SingleInstance::SingleInstance(bool forcePrimary, QObject *parent) :
-  QObject(parent), m_PrimaryInstance(false)
+SingleInstance::SingleInstance(Flags flags, QObject *parent) :
+  QObject(parent), m_Ephemeral(false), m_OwnsSM(false)
 {
   m_SharedMem.setKey(s_Key);
+
   if (!m_SharedMem.create(1)) {
-    if (forcePrimary) {
+    if (flags.testFlag(ForcePrimary)) {
       while (m_SharedMem.error() == QSharedMemory::AlreadyExists) {
         Sleep(500);
         if (m_SharedMem.create(1)) {
-          m_PrimaryInstance = true;
+          m_OwnsSM = true;
           break;
         }
       }
     }
 
     if (m_SharedMem.error() == QSharedMemory::AlreadyExists) {
-      m_SharedMem.attach();
-      m_PrimaryInstance = false;
+      if (!flags.testFlag(AllowMultiple)) {
+        m_SharedMem.attach();
+        m_Ephemeral = true;
+      }
     }
+
     if ((m_SharedMem.error() != QSharedMemory::NoError) &&
         (m_SharedMem.error() != QSharedMemory::AlreadyExists)) {
       throw MOBase::MyException(tr("SHM error: %1").arg(m_SharedMem.errorString()));
     }
   } else {
-    m_PrimaryInstance = true;
+    m_OwnsSM = true;
   }
-  if (m_PrimaryInstance) {
+
+  if (m_OwnsSM) {
     connect(&m_Server, SIGNAL(newConnection()), this, SLOT(receiveMessage()), Qt::QueuedConnection);
     // has to be called before listen
     m_Server.setSocketOptions(QLocalServer::WorldAccessOption);
@@ -65,7 +70,7 @@ SingleInstance::SingleInstance(bool forcePrimary, QObject *parent) :
 
 void SingleInstance::sendMessage(const QString &message)
 {
-  if (m_PrimaryInstance) {
+  if (m_OwnsSM) {
     // nobody there to receive the message
     return;
   }
-- 
cgit v1.3.1