[gnome-contacts/gnome-3-8] Dispose of cheese widget on avatar dialog destroy



commit e841d8a70609c3a8181cbb9cc264ddd82996f47e
Author: Chris Cummins <christopher e cummins intel com>
Date:   Fri May 24 14:15:25 2013 +0100

    Dispose of cheese widget on avatar dialog destroy
    
    This ensures that the cheese widget is destroyed when the avatar dialog
    is closed. If the widget is not destroyed then the camera device remains
    in use, causing a blank preview to be shown if the dialog is reopened.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=700959

 src/contacts-avatar-dialog.vala |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/src/contacts-avatar-dialog.vala b/src/contacts-avatar-dialog.vala
index e3d23d5..590c622 100644
--- a/src/contacts-avatar-dialog.vala
+++ b/src/contacts-avatar-dialog.vala
@@ -448,6 +448,14 @@ public class Contacts.AvatarDialog : Dialog {
          }
        }
 
+#if HAVE_CHEESE
+       /* Ensure the Vala garbage collector disposes of the Cheese widget.
+        * This prevents the 'Device or resource busy' warnings, see:
+        *   https://bugzilla.gnome.org/show_bug.cgi?id=700959
+        */
+       cheese = null;
+#endif
+
        this.destroy ();
       });
 


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