[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/aqua

[Michael Meeks]

 vcl/aqua/source/app/salinst.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4c6646b2b5accd492958318f34f3b8059717c8e6
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Tue Dec 31 10:07:20 2013 +0000

    fdo#39007: blind fix for renamed OS X restore-state file
    
    Remove also a potential restorecount.txt file (as reported in the bug) in addition to a potential restorecount.plist.
    
    Change-Id: I96fb688e9dda804f240cad8f2109c5880b544302
    Reviewed-on: https://gerrit.libreoffice.org/7239
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Signed-off-by: Tor Lillqvist <tml at collabora.com>

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 790b987..6ac7094 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -198,6 +198,7 @@ static void initNSApp()
 sal_Bool ImplSVMainHook( int * pnInit )
 {
     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]);
 
     gpnInit = pnInit;