From 1c70d20fcb3a0e8a0e9752b0e3ee45532da8f72a Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 21 Dec 2017 16:19:42 +0000 Subject: rhbz#1527945 segv on failed open of password protected doc in gnome-documents Change-Id: I1bec502ae20d03214c673d8911792c89669c0fe9 Reviewed-on: https://gerrit.libreoffice.org/46921 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- libreofficekit/source/gtk/lokdocview.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libreofficekit') diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx index ea9047fb3101..ca4e2433c43a 100644 --- a/libreofficekit/source/gtk/lokdocview.cxx +++ b/libreofficekit/source/gtk/lokdocview.cxx @@ -2225,7 +2225,6 @@ openDocumentInThread (gpointer data) priv->m_pOffice->pClass->registerCallback(priv->m_pOffice, globalCallbackWorker, pDocView); priv->m_pDocument = priv->m_pOffice->pClass->documentLoad( priv->m_pOffice, priv->m_aDocPath.c_str() ); - priv->m_eDocumentType = static_cast(priv->m_pDocument->pClass->getDocumentType(priv->m_pDocument)); if ( !priv->m_pDocument ) { char *pError = priv->m_pOffice->pClass->getError( priv->m_pOffice ); @@ -2233,6 +2232,7 @@ openDocumentInThread (gpointer data) } else { + priv->m_eDocumentType = static_cast(priv->m_pDocument->pClass->getDocumentType(priv->m_pDocument)); gdk_threads_add_idle(postDocumentLoad, pDocView); g_task_return_boolean (task, true); } -- cgit