summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2013-12-31 10:07:20 +0000
committerMichael Meeks <michael.meeks@collabora.com>2014-01-02 10:50:37 +0000
commit4c6646b2b5accd492958318f34f3b8059717c8e6 (patch)
tree68fdcbf8ee91a59155182b64eecc7298227d3bb4
parent2bbcd06df60f4e7ab76e908a1173eeb343b22868 (diff)
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@collabora.com> Tested-by: Tor Lillqvist <tml@collabora.com> Signed-off-by: Tor Lillqvist <tml@collabora.com>
-rw-r--r--vcl/aqua/source/app/salinst.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 790b987e71af..6ac7094f7a2d 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;