From 80359f3e5e21964d7d27d446da5479705a209296 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <chris@qbittorrent.org>
Date: Sun, 24 Jun 2012 15:03:12 +0300
Subject: [PATCH] Fix torrent loading on Mac OS X (closes #1011229)

---
 src/Info.plist          |  2 ++
 src/main.cpp            |  3 +++
 src/qmacapplication.cpp | 17 +++++++++++++++--
 src/qmacapplication.h   |  5 +++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/Info.plist b/src/Info.plist
index ee8eda39b..35b8e922b 100644
--- a/src/Info.plist
+++ b/src/Info.plist
@@ -52,6 +52,8 @@
 	<string>qbittorrent</string>
 	<key>CFBundleIdentifier</key>
 	<string>org.qbittorrent</string>
+	<key>NSAppleScriptEnabled</key>
+	<string>YES</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2006-2012 Christophe Dumez</string>
 	<key>UTExportedTypeDeclarations</key>
diff --git a/src/main.cpp b/src/main.cpp
index 13b2e6e20..8aef644d0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -307,6 +307,9 @@ int main(int argc, char *argv[]) {
   QObject::connect(&app, SIGNAL(messageReceived(const QString&)),
                    &window, SLOT(processParams(const QString&)));
   app.setActivationWindow(&window);
+#ifdef Q_WS_MAC
+  static_cast<QMacApplication*>(&app)->setReadyToProcessEvents();
+#endif // Q_WS_MAC
 #else
   // Load Headless class
   HeadlessLoader loader(torrentCmdLine);
diff --git a/src/qmacapplication.cpp b/src/qmacapplication.cpp
index e8680255e..1361db949 100644
--- a/src/qmacapplication.cpp
+++ b/src/qmacapplication.cpp
@@ -34,11 +34,21 @@
 #include "qmacapplication.h"
 
 QMacApplication::QMacApplication(QString appid, int &argc, char** argv) :
-    QtSingleApplication(appid, argc, argv)
+  QtSingleApplication(appid, argc, argv),
+  m_readyToProcessEvents(false)
 {
   qDebug("Constructing a QMacApplication to receive file open events");
 }
 
+void QMacApplication::setReadyToProcessEvents()
+{
+  m_readyToProcessEvents = true;
+  if (!m_torrentsQueue.isEmpty()) {
+    emit newFileOpenMacEvent(m_torrentsQueue.join("|"));
+    m_torrentsQueue.clear();
+  }
+}
+
 bool QMacApplication::event(QEvent * ev) {
   switch (ev->type()) {
   case QEvent::FileOpen:
@@ -49,7 +59,10 @@ bool QMacApplication::event(QEvent * ev) {
         path = static_cast<QFileOpenEvent *>(ev)->url().toString();
       }
       qDebug("Received a mac file open event: %s", qPrintable(path));
-      emit newFileOpenMacEvent(path);
+      if (m_readyToProcessEvents)
+        emit newFileOpenMacEvent(path);
+      else
+        m_torrentsQueue.append(path);
       return true;
     }
   default:
diff --git a/src/qmacapplication.h b/src/qmacapplication.h
index 55b6e18fd..8148a4e13 100644
--- a/src/qmacapplication.h
+++ b/src/qmacapplication.h
@@ -31,12 +31,14 @@
 #define QMACAPPLICATION_H
 
 #include "qtsingleapplication.h"
+#include <QStringList>
 
 class QMacApplication : public QtSingleApplication
 {
   Q_OBJECT
 public:
   explicit QMacApplication(QString appid, int &argc, char** argv);
+  void setReadyToProcessEvents();
 
 signals:
   void newFileOpenMacEvent(const QString &path);
@@ -44,6 +46,9 @@ signals:
 protected:
   bool event(QEvent *);
 
+private:
+  bool m_readyToProcessEvents;
+  QStringList m_torrentsQueue;
 };
 
 #endif // QMACAPPLICATION_H