[Libreoffice-commits] core.git: vcl/osx

[Tor Lillqvist]

 vcl/osx/salinst.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 20c9ceb708e4720205a303bf2d41274b1311e36b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat May 23 10:56:30 2015 +0100

    Don't do any magic LO OS X application stuff in a LOKit client
    
    Change-Id: If6b6c3e48c7d0681958ff0e2afe0b0be5f6ee1ab

diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index cec89e8..2d8f5c5 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -23,6 +23,8 @@
 
 #include <tools/solarmutex.hxx>
 
+#include "comphelper/lok.hxx"
+
 #include "osl/process.h"
 
 #include "rtl/ustrbuf.hxx"
@@ -182,6 +184,9 @@ static void initNSApp()
 
 bool ImplSVMainHook( int * pnInit )
 {
+    if (comphelper::LibreOfficeKit::isActive())
+        return false;
+
     unlink([[NSString stringWithFormat:@"%@/Library/Saved Application State/%s.savedState/restorecount.plist", NSHomeDirectory(), MACOSX_BUNDLE_IDENTIFIER] UTF8String]);
     unlink([[NSString stringWithFormat:@"%@/Library/Saved Application State/%s.savedState/restorecount.txt", NSHomeDirectory(), MACOSX_BUNDLE_IDENTIFIER] UTF8String]);