Browse Source

Don't force restore=none if no 'restore' option in current VIEW

git-svn-id: https://klish.googlecode.com/svn/trunk@153 0eaa4687-2ee9-07dd-09d9-bcdd2d2dd5fb
Serj Kalichev 13 years ago
parent
commit
71b264fdb3
1 changed files with 8 additions and 6 deletions
  1. 8 6
      clish/shell/shell_tinyxml_read.cpp

+ 8 - 6
clish/shell/shell_tinyxml_read.cpp

@@ -124,12 +124,14 @@ static void process_view(clish_shell_t * shell, TiXmlElement * element, void *)
 		clish_view__set_depth(view, res);
 	}
 
-	if (restore && !lub_string_nocasecmp(restore, "depth"))
-		clish_view__set_restore(view, CLISH_RESTORE_DEPTH);
-	else if (restore && !lub_string_nocasecmp(restore, "view"))
-		clish_view__set_restore(view, CLISH_RESTORE_VIEW);
-	else
-		clish_view__set_restore(view, CLISH_RESTORE_NONE);
+	if (restore) {
+		if (!lub_string_nocasecmp(restore, "depth"))
+			clish_view__set_restore(view, CLISH_RESTORE_DEPTH);
+		else if (!lub_string_nocasecmp(restore, "view"))
+			clish_view__set_restore(view, CLISH_RESTORE_VIEW);
+		else
+			clish_view__set_restore(view, CLISH_RESTORE_NONE);
+	}
 
 	process_children(shell, element, view);
 }