[cheese] Do not override errors in camera_state_change_null



commit 20457ffa57d2cfb7d9169e662a4553b3eb3ee09b
Author: Hans de Goede <hdegoede redhat com>
Date:   Wed Aug 7 13:36:30 2013 +0200

    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>

 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"));
+        }
     }
 
   /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]