diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2013-08-07 13:36:30 +0200 |
|---|---|---|
| committer | David King <amigadave@amigadave.com> | 2013-09-02 22:14:49 +0100 |
| commit | 20457ffa57d2cfb7d9169e662a4553b3eb3ee09b (patch) | |
| tree | 48d3040c9cd6b82464039468de7908622d02aacc | |
| parent | d55e6732315744725b5afa2b90c8c693ec93d5ee (diff) | |
Do not override errors in camera_state_change_null
If a more detailed error has already been set (through a GError return
from libcheese), do not override it when changing state to null.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | src/cheese-window.vala | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/cheese-window.vala b/src/cheese-window.vala index 7c18df8..a406288 100644 --- a/src/cheese-window.vala +++ b/src/cheese-window.vala @@ -1147,7 +1147,10 @@ public class Cheese.MainWindow : Gtk.ApplicationWindow */ public void camera_state_change_null () { - show_error (_("There was an error playing video from the webcam")); + if (!error_layer.visible) + { + show_error (_("There was an error playing video from the webcam")); + } } /** |