summaryrefslogtreecommitdiff
path: root/libcaja-private
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2011-12-26 20:10:02 +0100
committerStefano Karapetsas <[email protected]>2011-12-26 20:10:02 +0100
commit1ecbd2cd9339b1a13551a945f35b4be05f18cb43 (patch)
treebcb940609545673fdf07538ccbbbc38e63d3925e /libcaja-private
parentbd5fd70b498e935886c0325e51b9962a4e8e5c7a (diff)
downloadcaja-1ecbd2cd9339b1a13551a945f35b4be05f18cb43.tar.bz2
caja-1ecbd2cd9339b1a13551a945f35b4be05f18cb43.tar.xz
updated UNDO-REDO with nautilus-elementary bzr rev 137
Diffstat (limited to 'libcaja-private')
-rw-r--r--libcaja-private/caja-undostack-manager.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcaja-private/caja-undostack-manager.c b/libcaja-private/caja-undostack-manager.c
index f53d4466..ccb1c0f0 100644
--- a/libcaja-private/caja-undostack-manager.c
+++ b/libcaja-private/caja-undostack-manager.c
@@ -1089,8 +1089,8 @@ stack_clear_n_oldest (GQueue * stack, guint n)
guint i;
for (i = 0; i < n; i++) {
- action = (CajaUndoStackActionData *)
- g_queue_pop_tail (stack);
+ if ((action = (CajaUndoStackActionData *) g_queue_pop_tail (stack)) == NULL)
+ break;
if (action->locked) {
action->freed = TRUE;
} else {