X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=db428ad5248b8afc6b029dbf27960efc79e7a388;hb=47d2e643b787f50db5ac9d8cceae6abe2b1600a6;hp=5cdaa87471a3c55f3b4dd5a5b18e94494fd5b27d;hpb=9141e173a82b1105ed0f60c649bfc94dbc5a26b4;p=rocksndiamonds.git

diff --git a/src/libgame/setup.c b/src/libgame/setup.c
index 5cdaa874..db428ad5 100644
--- a/src/libgame/setup.c
+++ b/src/libgame/setup.c
@@ -1093,7 +1093,8 @@ void InitUserLevelDirectory(char *level_subdir)
     createDirectory(getUserLevelDir(NULL), "main user level", PERMS_PRIVATE);
     createDirectory(getUserLevelDir(level_subdir), "user level", PERMS_PRIVATE);
 
-    SaveUserLevelInfo();
+    if (setup.internal.create_user_levelset)
+      SaveUserLevelInfo();
   }
 }
 
@@ -3888,6 +3889,11 @@ static boolean AddTreeSetToTreeInfoExt(TreeInfo *tree_node_old, char *tree_dir,
     {
       // get level info tree node of personal user level set
       tree_node_old = getTreeInfoFromIdentifier(leveldir_first, getLoginName());
+
+      // this may happen if "setup.internal.create_user_levelset" is FALSE
+      // or if file "levelinfo.conf" is missing in personal user level set
+      if (tree_node_old == NULL)
+	tree_node_old = leveldir_first->node_group;
     }
     else
     {