Kaydet (Commit) 5296fbbc authored tarafından Andrzej Hunt's avatar Andrzej Hunt Kaydeden (comit) Tomaž Vajngerl

Fail LOK initialisation if restart is required.

Change-Id: Ia13a3523666147f002b5a5177fd6962d55556f56
üst d5b01426
...@@ -704,6 +704,15 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath) ...@@ -704,6 +704,15 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath)
pthread_create(&thread, 0, lo_startmain, NULL); pthread_create(&thread, 0, lo_startmain, NULL);
OfficeIPCThread::WaitForReady(); OfficeIPCThread::WaitForReady();
// If the Thread has been disabled again that indicates that a
// restart is required (or in any case we don't have a useable
// process around).
if (!OfficeIPCThread::IsEnabled())
{
fprintf(stderr, "LOK init failed -- restart required\n");
return false;
}
Application::EnableHeadlessMode(true); Application::EnableHeadlessMode(true);
ErrorHandler::RegisterDisplay(aBasicErrorFunc); ErrorHandler::RegisterDisplay(aBasicErrorFunc);
......
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