ekiga r6005 - in trunk: . lib/engine lib/engine/vidinput/skel

[mschneid svn gnome org]

Author: mschneid
Date: Fri Feb 29 19:53:47 2008
New Revision: 6005
URL: http://svn.gnome.org/viewvc/ekiga?rev=6005&view=rev

Log:
Fixed segfault on exit due to wrong order in calling destructors.


Modified:
   trunk/ChangeLog
   trunk/lib/engine/engine.cpp
   trunk/lib/engine/vidinput/skel/vidinput-core.cpp

Modified: trunk/lib/engine/engine.cpp
==============================================================================
--- trunk/lib/engine/engine.cpp	(original)
+++ trunk/lib/engine/engine.cpp	Fri Feb 29 19:53:47 2008
@@ -102,8 +102,8 @@
   core->add (*contact_core);
   core->add (*presence_core);
   core->add (*call_core);
-  core->add (*display_core);
   core->add (*vidinput_core);
+  core->add (*display_core);
   core->add (*hal_core);
   core->add (*runtime);
 

Modified: trunk/lib/engine/vidinput/skel/vidinput-core.cpp
==============================================================================
--- trunk/lib/engine/vidinput/skel/vidinput-core.cpp	(original)
+++ trunk/lib/engine/vidinput/skel/vidinput-core.cpp	Fri Feb 29 19:53:47 2008
@@ -62,6 +62,8 @@
 
 PreviewManager::~PreviewManager ()
 {
+  if (!stop_thread)
+    stop();
 }
 
 void PreviewManager::start (unsigned width, unsigned height)