X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Factions%2Flayeractivate.cpp;h=c7fbc30adb50582fd27c35925ee1b29932bdd1c4;hb=ffb41cfab976dd7402a9587d506ac65a26e9565c;hp=9b69de752168efb9acc7e17cb67a20aca43b5915;hpb=0468dda476c2e68e13f1dbbd2e1fdd93efc95ca2;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
index 9b69de7..c7fbc30 100644
--- a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
+++ b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -68,17 +69,12 @@ Action::LayerActivate::get_local_name()const
 {
 	if(!layer)
 		return _("Activate Layer");
-	String name;
-	if(layer->get_description().empty())
-		name=layer->get_local_name();
-	else
-		name=layer->get_description();
 
 	return strprintf("%s '%s'",
 					 new_status
 					 ? _("Activate Layer")
 					 : _("Deactivate Layer"),
-					 name.c_str());
+					 layer->get_non_empty_description().c_str());
 }
 
 Action::ParamVocab