67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
|
From 51ff0d863bc0e160094ec684018ee0068b7b612a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Date: Wed, 19 Jun 2013 17:29:28 +0200
|
||
|
|
Subject: [PATCH 12/13] cheese-preferences: Cleanly handle going from 1 -> 0
|
||
|
|
devices
|
||
|
|
|
||
|
|
Cleanly handle going from 1 -> 0 devices and going from 1 -> 0 -> 1 devices.
|
||
|
|
|
||
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
---
|
||
|
|
src/cheese-preferences.vala | 26 +++++++++++++++-----------
|
||
|
|
1 file changed, 15 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/cheese-preferences.vala b/src/cheese-preferences.vala
|
||
|
|
index faf6877..cad7eba 100644
|
||
|
|
--- a/src/cheese-preferences.vala
|
||
|
|
+++ b/src/cheese-preferences.vala
|
||
|
|
@@ -280,13 +280,13 @@ public class Cheese.PreferencesDialog : GLib.Object
|
||
|
|
[CCode (instance_pos = -1)]
|
||
|
|
public void on_source_change (Gtk.ComboBox combo)
|
||
|
|
{
|
||
|
|
- // TODO: Handle going from 1 to 0 devices, cleanly!
|
||
|
|
- return_if_fail (camera.num_camera_devices > 0);
|
||
|
|
-
|
||
|
|
TreeIter iter;
|
||
|
|
Cheese.CameraDevice dev;
|
||
|
|
string dev_node;
|
||
|
|
|
||
|
|
+ if (combo.get_active () == -1)
|
||
|
|
+ return;
|
||
|
|
+
|
||
|
|
combo.get_active_iter (out iter);
|
||
|
|
combo.model.get (iter, 1, out dev);
|
||
|
|
dev_node = dev.get_device_node ();
|
||
|
|
@@ -572,16 +572,20 @@ public class Cheese.PreferencesDialog : GLib.Object
|
||
|
|
private void remove_camera_device (TreeIter iter,
|
||
|
|
Cheese.CameraDevice device)
|
||
|
|
{
|
||
|
|
- unowned GLib.PtrArray devices = camera.get_camera_devices ();
|
||
|
|
-
|
||
|
|
- // Check if the camera that we want to remove, is the active one
|
||
|
|
- if (device.device_node == camera_device_node)
|
||
|
|
+ if (camera.num_camera_devices == 0) /* Last camera gone? */
|
||
|
|
{
|
||
|
|
- if (devices.len > 0)
|
||
|
|
- set_new_available_camera_device (iter);
|
||
|
|
- else
|
||
|
|
- this.dialog.hide();
|
||
|
|
+ ListStore resolution_model = new ListStore (2, typeof (string),
|
||
|
|
+ typeof (Cheese.VideoFormat));
|
||
|
|
+ photo_resolution_combo.model = resolution_model;
|
||
|
|
+ video_resolution_combo.model = resolution_model;
|
||
|
|
+ camera_device_node = "";
|
||
|
|
+ camera_error(_("No device found"));
|
||
|
|
}
|
||
|
|
+ else if (device.device_node == camera_device_node)
|
||
|
|
+ {
|
||
|
|
+ set_new_available_camera_device (iter);
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
camera_model.remove (iter);
|
||
|
|
|
||
|
|
if (camera_model.iter_n_children (null) <= 1)
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|