Attachment 147348 Details for Bug 227245 – OOo bandaid

[patch] OOo bandaid

openoffice.org-2.2.0.oooXXXXX.atkthreads.atexit.patch (text/plain), 1.12 KB, created by Caolan McNamara on 2007-02-05 12:03:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Caolan McNamara

Created: 2007-02-05 12:03:27 UTC

Size: 1.12 KB

patch

obsolete

>Index: unx/gtk/app/gtkinst.cxx
>===================================================================
>RCS file: /cvs/gsl/vcl/unx/gtk/app/gtkinst.cxx,v
>retrieving revision 1.16
>diff -u -r1.16 gtkinst.cxx
>--- openoffice.org.orig/vcl/unx/gtk/app/gtkinst.cxx	17 Sep 2006 12:29:23 -0000	1.16
>+++ openofficeorg/vcl/unx/gtk/app/gtkinst.cxx	5 Feb 2007 11:51:04 -0000
>@@ -103,16 +103,16 @@
> 
> extern "C" 
> {
>-	#define GET_YIELD_MUTEX() static_cast<GtkHookedYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())
>+	#define GET_YIELD_MUTEX() ImplGetSVData() ? static_cast<GtkHookedYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex()) : 0
> 	static void GdkThreadsEnter( void )
> 	{
>-		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
>-		pYieldMutex->ThreadsEnter();
>+		if (GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX())
>+		    pYieldMutex->ThreadsEnter();
> 	}
> 	static void GdkThreadsLeave( void )
> 	{
>-		GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX();
>-		pYieldMutex->ThreadsLeave();
>+		if (GtkHookedYieldMutex *pYieldMutex = GET_YIELD_MUTEX())
>+		    pYieldMutex->ThreadsLeave();
> 	}
> 	static bool hookLocks( oslModule pModule )
> 	{

Actions: View | Diff

Attachments on bug 227245: 147348