9b94ca029c
into gnome-3.10 but not all have been merged yet, re-add the non merged ones - Fix video recording not working - Allow changing effects while recording - Disallow changing camera settings while recording - Fix cheese misbehavior when going from 0 -> 1 or 1 -> 0 camera devices
31 lines
877 B
Diff
31 lines
877 B
Diff
From ec54a4dcbe7b814ab7b8ee60a44faefc091a3f96 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Tue, 18 Jun 2013 14:01:45 +0200
|
|
Subject: [PATCH 10/13] on_camera_update_num_camera_devices: Remove unnecessary
|
|
camera_changed() call
|
|
|
|
If the camera is actually changed then camera_changed already gets called
|
|
from either camera_play() or on_source_change().
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
---
|
|
src/cheese-preferences.vala | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
|
|
index e962062..2120432 100644
|
|
--- a/src/cheese-preferences.vala
|
|
+++ b/src/cheese-preferences.vala
|
|
@@ -541,8 +541,6 @@ public class Cheese.PreferencesDialog : GLib.Object
|
|
remove_camera_device (iter, old_device, active_device);
|
|
}
|
|
}
|
|
-
|
|
- camera_changed ();
|
|
}
|
|
|
|
/**
|
|
--
|
|
1.8.3.1
|
|
|