From 6516a6b7c19713de28db7142612f1c095e541317 Mon Sep 17 00:00:00 2001
From: Tannin <Tannin@Miranda>
Date: Sun, 17 Feb 2013 09:26:29 +0100
Subject: - moved shared and uibase libraries to namespaces - bugfix: the "fix
 mods" function was accessing the save game data incorrectly, causing a crash

---
 src/singleinstance.cpp | 176 ++++++++++++++++++++++++-------------------------
 1 file changed, 88 insertions(+), 88 deletions(-)

(limited to 'src/singleinstance.cpp')

diff --git a/src/singleinstance.cpp b/src/singleinstance.cpp
index 69de45e2..029e8366 100644
--- a/src/singleinstance.cpp
+++ b/src/singleinstance.cpp
@@ -17,91 +17,91 @@ You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "singleinstance.h"
-#include "report.h"
-#include "utility.h"
-#include <QLocalSocket>
-
-static const char s_Key[] = "mo-43d1a3ad-eeb0-4818-97c9-eda5216c29b5";
-static const int s_Timeout = 5000;
-
-
-SingleInstance::SingleInstance(bool forcePrimary, QObject *parent) :
-  QObject(parent), m_PrimaryInstance(false)
-{
-  m_SharedMem.setKey(s_Key);
-  if (!m_SharedMem.create(1)) {
-    if (forcePrimary) {
-      while (m_SharedMem.error() == QSharedMemory::AlreadyExists) {
-        Sleep(500);
-        if (m_SharedMem.create(1)) {
-          m_PrimaryInstance = true;
-          break;
-        }
-      }
-    }
-
-    if (m_SharedMem.error() == QSharedMemory::AlreadyExists) {
-      m_SharedMem.attach();
-      m_PrimaryInstance = false;
-    }
-    if ((m_SharedMem.error() != QSharedMemory::NoError) &&
-        (m_SharedMem.error() != QSharedMemory::AlreadyExists)) {
-      throw MyException(tr("SHM error: %1").arg(m_SharedMem.errorString()));
-    }
-  } else {
-    m_PrimaryInstance = true;
-  }
-  if (m_PrimaryInstance) {
-    connect(&m_Server, SIGNAL(newConnection()), this, SLOT(receiveMessage()));
-    m_Server.listen(s_Key);
-  }
-}
-
-
-void SingleInstance::sendMessage(const QString &message)
-{
-  if (m_PrimaryInstance) {
-    // nobody there to receive the message
-    return;
-  }
-  QLocalSocket socket(this);
-
-  bool connected = false;
-  for(int i = 0; i < 2 && !connected; ++i) {
-    if (i > 0) {
-      Sleep(250);
-    }
-
-    // other instance may be just starting up
-    socket.connectToServer(s_Key, QIODevice::WriteOnly);
-    connected = socket.waitForConnected(s_Timeout);
-  }
-
-  if (!connected) {
-    reportError(tr("failed to connect to running instance: %1").arg(socket.errorString()));
-    return;
-  }
-
-  socket.write(message.toUtf8());
-  if (!socket.waitForBytesWritten(s_Timeout)) {
-    reportError(tr("failed to connect to running instance: %1").arg(socket.errorString()));
-    return;
-  }
-
-  socket.disconnectFromServer();
-}
-
-
-void SingleInstance::receiveMessage()
-{
-  QLocalSocket *socket = m_Server.nextPendingConnection();
-  if (!socket->waitForReadyRead(s_Timeout)) {
-    reportError(tr("failed to receive data from secondary instance: %1").arg(socket->errorString()));
-    return;
-  }
-
-  QString message = QString::fromUtf8(socket->readAll().constData());
-  emit messageSent(message);
-  socket->disconnectFromServer();
-}
+#include "singleinstance.h"
+#include "report.h"
+#include "utility.h"
+#include <QLocalSocket>
+
+static const char s_Key[] = "mo-43d1a3ad-eeb0-4818-97c9-eda5216c29b5";
+static const int s_Timeout = 5000;
+
+
+SingleInstance::SingleInstance(bool forcePrimary, QObject *parent) :
+  QObject(parent), m_PrimaryInstance(false)
+{
+  m_SharedMem.setKey(s_Key);
+  if (!m_SharedMem.create(1)) {
+    if (forcePrimary) {
+      while (m_SharedMem.error() == QSharedMemory::AlreadyExists) {
+        Sleep(500);
+        if (m_SharedMem.create(1)) {
+          m_PrimaryInstance = true;
+          break;
+        }
+      }
+    }
+
+    if (m_SharedMem.error() == QSharedMemory::AlreadyExists) {
+      m_SharedMem.attach();
+      m_PrimaryInstance = false;
+    }
+    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;
+  }
+  if (m_PrimaryInstance) {
+    connect(&m_Server, SIGNAL(newConnection()), this, SLOT(receiveMessage()));
+    m_Server.listen(s_Key);
+  }
+}
+
+
+void SingleInstance::sendMessage(const QString &message)
+{
+  if (m_PrimaryInstance) {
+    // nobody there to receive the message
+    return;
+  }
+  QLocalSocket socket(this);
+
+  bool connected = false;
+  for(int i = 0; i < 2 && !connected; ++i) {
+    if (i > 0) {
+      Sleep(250);
+    }
+
+    // other instance may be just starting up
+    socket.connectToServer(s_Key, QIODevice::WriteOnly);
+    connected = socket.waitForConnected(s_Timeout);
+  }
+
+  if (!connected) {
+    reportError(tr("failed to connect to running instance: %1").arg(socket.errorString()));
+    return;
+  }
+
+  socket.write(message.toUtf8());
+  if (!socket.waitForBytesWritten(s_Timeout)) {
+    reportError(tr("failed to connect to running instance: %1").arg(socket.errorString()));
+    return;
+  }
+
+  socket.disconnectFromServer();
+}
+
+
+void SingleInstance::receiveMessage()
+{
+  QLocalSocket *socket = m_Server.nextPendingConnection();
+  if (!socket->waitForReadyRead(s_Timeout)) {
+    reportError(tr("failed to receive data from secondary instance: %1").arg(socket->errorString()));
+    return;
+  }
+
+  QString message = QString::fromUtf8(socket->readAll().constData());
+  emit messageSent(message);
+  socket->disconnectFromServer();
+}
-- 
cgit v1.3.1