2 files changed, 30 insertions, 38 deletions

diff --git a/fluid/Fl_Group_Type.cxx b/fluid/Fl_Group_Type.cxx
index 30c5007dd..6fa4cf867 100644
--- a/fluid/Fl_Group_Type.cxx
+++ b/fluid/Fl_Group_Type.cxx
@@ -337,30 +337,26 @@ void Fl_Table_Type::move_child(Fl_Type* cc, Fl_Type* before) {
 Fl_Widget *Fl_Group_Type::enter_live_mode(int) {
   Fl_Group *grp = new Fl_Group(o->x(), o->y(), o->w(), o->h());
   live_widget = grp;
-  if (live_widget) {
-    copy_properties();
-    Fl_Type *n;
-    for (n = next; n && n->level > level; n = n->next) {
-      if (n->level == level+1)
-        n->enter_live_mode();
-    }
-    grp->end();
+  copy_properties();
+  Fl_Type *n;
+  for (n = next; n && n->level > level; n = n->next) {
+    if (n->level == level+1)
+      n->enter_live_mode();
   }
+  grp->end();
   return live_widget;
 }
 
 Fl_Widget *Fl_Tabs_Type::enter_live_mode(int) {
   Fl_Tabs *grp = new Fl_Tabs(o->x(), o->y(), o->w(), o->h());
   live_widget = grp;
-  if (live_widget) {
-    copy_properties();
-    Fl_Type *n;
-    for (n = next; n && n->level > level; n = n->next) {
-      if (n->level == level+1)
-        n->enter_live_mode();
-    }
-    grp->end();
+  copy_properties();
+  Fl_Type *n;
+  for (n = next; n && n->level > level; n = n->next) {
+    if (n->level == level+1)
+      n->enter_live_mode();
   }
+  grp->end();
   grp->value(((Fl_Tabs*)o)->value());
   return live_widget;
 }
@@ -368,10 +364,8 @@ Fl_Widget *Fl_Tabs_Type::enter_live_mode(int) {
 Fl_Widget *Fl_Table_Type::enter_live_mode(int) {
   Fl_Group *grp = new Fluid_Table(o->x(), o->y(), o->w(), o->h());
   live_widget = grp;
-  if (live_widget) {
-    copy_properties();
-    grp->end();
-  }
+  copy_properties();
+  grp->end();
   return live_widget;
 }
 
@@ -396,15 +390,13 @@ Fl_Widget *Fl_Scroll_Type::enter_live_mode(int) {
   Fl_Group *grp = new Fl_Scroll(o->x(), o->y(), o->w(), o->h());
   grp->show();
   live_widget = grp;
-  if (live_widget) {
-    copy_properties();
-    Fl_Type *n;
-    for (n = next; n && n->level > level; n = n->next) {
-      if (n->level == level+1)
-        n->enter_live_mode();
-    }
-    grp->end();
+  copy_properties();
+  Fl_Type *n;
+  for (n = next; n && n->level > level; n = n->next) {
+    if (n->level == level+1)
+      n->enter_live_mode();
   }
+  grp->end();
   return live_widget;
 }
 
diff --git a/fluid/Fl_Menu_Type.cxx b/fluid/Fl_Menu_Type.cxx
index 5e51a6ee2..e4c09be01 100644
--- a/fluid/Fl_Menu_Type.cxx
+++ b/fluid/Fl_Menu_Type.cxx
@@ -360,27 +360,27 @@ void Fl_Menu_Item_Type::write_code1() {
     }
   }
 
-  int init = 0;
+  int menuItemInitialized = 0;
   // if the name is an array variable, assign the value here
   if (name() && strchr(name(), '[')) {
     write_c("%s%s = &%s[%d];\n", indent(), name(), mname, i);
   }
   if (image) {
-    if (!init) {
-      init = 1;
-      write_c("%s{ Fl_Menu_Item* o = &%s[%d];\n", indent(), mname, i);
-    }
+    menuItemInitialized = 1;
+    write_c("%s{ Fl_Menu_Item* o = &%s[%d];\n", indent(), mname, i);
     image->write_code("o");
   }
-  for (int n=0; n < NUM_EXTRA_CODE; n++)
+  for (int n=0; n < NUM_EXTRA_CODE; n++) {
     if (extra_code(n) && !isdeclare(extra_code(n))) {
-      if (!init) {
-	init = 1;
-	write_c("%s{ Fl_Menu_Item* o = &%s[%d];\n", indent(), mname, i);
+      if (!menuItemInitialized) {
+        menuItemInitialized = 1;
+        write_c("%s{ Fl_Menu_Item* o = &%s[%d];\n", indent(), mname, i);
       }
       write_c("%s  %s\n", indent(), extra_code(n));
     }
-  if (init) write_c("%s}\n",indent());
+  }
+  if (menuItemInitialized)
+    write_c("%s}\n",indent());
 }
 
 void Fl_Menu_Item_Type::write_code2() {}