diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-01-24 16:56:00 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-01-24 18:11:33 +0000 |
| commit | 651803c7a5d4568ade7ca829cfce400090637e38 (patch) | |
| tree | 8fd6b2d358cda3a264a267979e199d18d7c34701 /desktop | |
| parent | 19d423ab67346c2542a1acea1f485a7c43e2dd90 (diff) | |
android: disable lock-file bits for now
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/app/app.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index afa53f602541..496a8b9c9242 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -1540,6 +1540,7 @@ int Desktop::Main() // there is no other instance using our data files from a remote host RTL_LOGFILE_CONTEXT_TRACE( aLog, "desktop (lo119109) Desktop::Main -> Lockfile" ); m_pLockfile.reset( new Lockfile ); +#ifndef ANDROID if ( !rCmdLineArgs.IsHeadless() && !rCmdLineArgs.IsInvisible() && !rCmdLineArgs.IsNoLockcheck() && !m_pLockfile->check( Lockfile_execWarning )) { @@ -1559,12 +1560,12 @@ int Desktop::Main() return EXIT_FAILURE; } RTL_LOGFILE_CONTEXT_TRACE( aLog, "} GetEnableATToolSupport" ); +#endif // terminate if requested... if( rCmdLineArgs.IsTerminateAfterInit() ) return EXIT_SUCCESS; - // Read the common configuration items for optimization purpose if ( !InitializeConfiguration() ) return EXIT_FAILURE; |