Kaydet (Commit) 651803c7 authored tarafından Michael Meeks's avatar Michael Meeks

android: disable lock-file bits for now

üst 19d423ab
......@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment