From 4d48e40484672ad35c15a4d9a61da20e3d124ccb Mon Sep 17 00:00:00 2001 From: David Capello Date: Tue, 29 Apr 2014 01:01:25 -0300 Subject: [PATCH] Fix RemoveLayer command so it's disabled when we have no more layers to remove --- src/app/commands/cmd_remove_layer.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/commands/cmd_remove_layer.cpp b/src/app/commands/cmd_remove_layer.cpp index 80482c2ea..d4c613352 100644 --- a/src/app/commands/cmd_remove_layer.cpp +++ b/src/app/commands/cmd_remove_layer.cpp @@ -54,9 +54,11 @@ RemoveLayerCommand::RemoveLayerCommand() bool RemoveLayerCommand::onEnabled(Context* context) { - ContextWriter writer(context); - Sprite* sprite(writer.sprite()); - return (sprite != NULL); + return context->checkFlags(ContextFlags::ActiveDocumentIsWritable | + ContextFlags::HasActiveSprite | + ContextFlags::HasActiveLayer | + ContextFlags::ActiveLayerIsReadable | + ContextFlags::ActiveLayerIsWritable); } void RemoveLayerCommand::onExecute(Context* context)