Merge branch 'develop' of ssh://git.dsv.su.se/git/scipro/scipro into local_develop

2011-07-28 15:31:50 +02:00 · 2011-07-28 15:31:50 +02:00 · 115310561c
commit 115310561c
parent ebd17c914c 514bd51961
1 changed files with 2 additions and 0 deletions
--- a/src/main/java/se/su/dsv/scipro/SciProSession.java
+++ b/src/main/java/se/su/dsv/scipro/SciProSession.java
@ -186,6 +186,8 @@ public class SciProSession extends WebSession {
 			Project activeProject = userSettings.getActiveProject();
 			if(activeProject != null)
 				activeProjectId = activeProject.getId();
+			else
+				activeProjectId = null;
 		}
 		else {
 			userSettings = new UserSettings(user);