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

[mschneid svn gnome org]

Author: mschneid
Date: Tue Apr  1 18:59:53 2008
New Revision: 6104
URL: http://svn.gnome.org/viewvc/ekiga?rev=6104&view=rev

Log:
Fix reactivation of video device after re-plugin.


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

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	Tue Apr  1 18:59:53 2008
@@ -482,7 +482,10 @@
        if ( ( desired_device.type   == vidinput_device.type   ) &&
             ( desired_device.source == vidinput_device.source ) &&
             ( desired_device.device == vidinput_device.device ) ) {
-         set_vidinput_device(desired_device, current_channel, current_format);
+	 desired_device.type = "";
+	 desired_device.source = "";
+	 desired_device.device = "";
+         set_vidinput_device(vidinput_device, current_channel, current_format);
        }
 
        runtime.run_in_main (sigc::bind (vidinputdevice_added.make_slot (), vidinput_device));