Index: source/blender/src/editobject.c
===================================================================
--- source/blender/src/editobject.c	(revision 16715)
+++ source/blender/src/editobject.c	(working copy)
@@ -240,8 +240,9 @@
 
 	/* this function also comes from an info window */
 	if ELEM(curarea->spacetype, SPACE_VIEW3D, SPACE_INFO); else return;
+	check_editmode(OB_LAMP);
 	
-	if(G.obedit==0) {
+	if(G.obedit==NULL) {
 		add_object_draw(OB_LAMP);
 		base_init_from_view3d(BASACT, G.vd);
 	}