Changeset 383 for bdm/user_info.cpp

Timestamp:

06/17/09 23:54:11 (15 years ago)

Author:

smidl

Message:

mex for merging and fixes in UI

Files:

• bdm/user_info.cpp (modified) (2 diffs)

bdm/user_info.cpp

@@ -106 +106 @@
 const Setting& UI::SettingResolver::initialize_reference(UI_File *&file, const Setting &potential_link)
 {
+        file = NULL;
+
     if ( potential_link.getType() !=  Setting::TypeString )
             return potential_link;
@@ -122 +124 @@
     else
         {
-                file = NULL;
                 result = &potential_link;
         while ( !result->isRoot() )