Hi Fred,
your patch works fine for me.
Big thanks!
Maik
Frederic Bouvier schrieb am 26.01.2007 20:41:
> Selon Nick Warne :
>
>
>> Reports from IRC say this is fixed in plib, but I can still get a 100%
>> reliable crash with OSG build.
>>
>> Enter MP server using Harrier. Get someone to join/leave/join with the
>> dhc2F.
>> Immediate segfault on the second join.
>>
>> Below is my earlier mail with trace etc.
>>
>
>
> Are you able to test the patch below. If it works for you, I'll commit it.
>
> -Fred
>
> cvs -z4 -q diff -u -wb -- shadanim.cxx (in directory
> C:\Devel\SimGear\simgear\scene\model\)
> Index: shadanim.cxx
> ===================================================================
> RCS file: /var/cvs/SimGear-0.3/SimGear/simgear/scene/model/shadanim.cxx,v
> retrieving revision 1.9
> diff -u -w -b -r1.9 shadanim.cxx
> --- shadanim.cxx 3 Dec 2006 16:57:21 -0000 1.9
> +++ shadanim.cxx 26 Jan 2007 19:14:34 -0000
> @@ -126,14 +126,12 @@
> static osg::TextureCubeMap*
> getOrCreateTextureCubeMap()
> {
> - static osg::TextureCubeMap* textureCubeMap = 0;
> - if (textureCubeMap)
> - return textureCubeMap;
> + static osg::ref_ptr<osg::TextureCubeMap> textureCubeMap;
>
> static SGMutex mutex;
> SGGuard<SGMutex> locker(mutex);
> - if (textureCubeMap)
> - return textureCubeMap;
> + if (textureCubeMap.get())
> + return textureCubeMap.get();
>
> // create and setup the texture object
> textureCubeMap = new osg::TextureCubeMap;
> @@ -146,7 +144,7 @@
>
> textureCubeMap->setUpdateCallback(new SGMapGenCallback);
>
> - return textureCubeMap;
> + return textureCubeMap.get();
> }
>
> static void create_specular_highlights(osg::Node *node)
>
>
>
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Flightgear-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/flightgear-devel
