|
 |
ecdf9b |
From f6d7f1e2a240641080b8d87a169c22571d39316c Mon Sep 17 00:00:00 2001
|
|
|
ecdf9b |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
Date: Thu, 13 Jun 2013 11:37:19 +0200
|
|
|
ecdf9b |
Subject: [PATCH 34/35] cheese: Fix assert failures when taking a photo
|
|
|
ecdf9b |
|
|
|
ecdf9b |
Before this patch, cheese would log the following each time the user takes
|
|
|
ecdf9b |
a photo:
|
|
|
ecdf9b |
|
|
|
ecdf9b |
(cheese:21719): GLib-GIO-CRITICAL **: g_file_info_get_size: assertion `G_IS_FILE_INFO (info)' failed
|
|
|
ecdf9b |
|
|
|
ecdf9b |
(cheese:21719): GLib-GObject-CRITICAL **: g_object_unref: assertion `G_IS_OBJECT (object)' failed
|
|
|
ecdf9b |
|
|
|
ecdf9b |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
ecdf9b |
---
|
|
|
ecdf9b |
src/thumbview/cheese-thumb-view.c | 7 +++++++
|
|
|
ecdf9b |
1 file changed, 7 insertions(+)
|
|
|
ecdf9b |
|
|
|
ecdf9b |
diff --git a/src/thumbview/cheese-thumb-view.c b/src/thumbview/cheese-thumb-view.c
|
|
|
ecdf9b |
index c229b1a..a702fc0 100644
|
|
|
ecdf9b |
--- a/src/thumbview/cheese-thumb-view.c
|
|
|
ecdf9b |
+++ b/src/thumbview/cheese-thumb-view.c
|
|
|
ecdf9b |
@@ -205,6 +205,13 @@ cheese_thumb_view_append_item (CheeseThumbView *thumb_view, GFile *file)
|
|
|
ecdf9b |
|
|
|
ecdf9b |
info = g_file_query_info (file, G_FILE_ATTRIBUTE_STANDARD_SIZE, 0, NULL,
|
|
|
ecdf9b |
NULL);
|
|
|
ecdf9b |
+ if (!info)
|
|
|
ecdf9b |
+ {
|
|
|
ecdf9b |
+ /* This is normal since photos first get created with a tmpname, ie:
|
|
|
ecdf9b |
+ * "2013-06-13-113155.jpg.DQRGYW" and then moved to their final name,
|
|
|
ecdf9b |
+ * we will get another append_item call for the final name. */
|
|
|
ecdf9b |
+ return;
|
|
|
ecdf9b |
+ }
|
|
|
ecdf9b |
size = g_file_info_get_size (info);
|
|
|
ecdf9b |
g_object_unref (info);
|
|
|
ecdf9b |
|
|
|
ecdf9b |
--
|
|
|
ecdf9b |
1.8.2.1
|
|
|
ecdf9b |
|