From 921003dea98700e61dd88b7e14ea850e4a94de24 Mon Sep 17 00:00:00 2001
From: bjschuma <bjschuma@saturos.localdomain>
Date: Thu, 14 Jan 2010 21:34:48 -0500
Subject: [PATCH] Only read in the session once during startup

---
 src/base/manager.py  | 12 ++++++------
 src/base/scion.py    |  8 +-------
 src/base/settings.py | 11 ++++++-----
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/base/manager.py b/src/base/manager.py
index b157664f..f44fe277 100644
--- a/src/base/manager.py
+++ b/src/base/manager.py
@@ -16,13 +16,12 @@ class Manager:
 		self.enabled = dict()
 		self.disabled = dict()
 		self.restored = []
-		self.restoresession()
 
 
 	def addPlugins(self, plugins):
 		# Add each plugin to the disabled list
 		for plugin in plugins:
-			write("Adding plugin: " + str(plugin), True)
+			write("Adding plugin: "+plugin.name, True)
 			self.disabled[plugin.name] = plugin
 
 
@@ -76,11 +75,12 @@ class Manager:
 	def shutdown(self):
 		settings.get("loopquit")()
 		write("Shutting down manager, disabling all active plugins", True)
-		self.savesession()
+		session = self.findsession()
+		self.savesession(session)
 		keys = self.enabled.keys()
 		for plugin in keys:
 			self.disablePlugin(plugin)
-		settings.save(self.findsession())
+		settings.save(session)
 
 
 	def startup(self):
@@ -113,8 +113,8 @@ class Manager:
 		return path
 
 
-	def savesession(self):
-		path = join(self.findsession(),"enabled")
+	def savesession(self,session):
+		path = join(session,"enabled")
 		file = fopen(path,'w')
 		for key in self.enabled.keys():
 			file.write(key+"\n")
diff --git a/src/base/scion.py b/src/base/scion.py
index ab067a80..95390a70 100644
--- a/src/base/scion.py
+++ b/src/base/scion.py
@@ -4,20 +4,15 @@
 __author__="bjschuma"
 __date__ ="$Dec 4, 2009 3:37:21 PM$"
 
-#global name
-#name = "scion"
-
 # We need to import settings before we can use disp()
 import settings
 settings.set("appname","scion")
 
 # The first thing we do is import write() so we can occasionally print messages
 from bt.message import write
-#write("Welcome to " + name)
 
-# Next, we set the process name to ocarina2
+# We need this next import to set the process name
 from bt.proc import setname
-#setname()
 
 # Import the plugin loader class!
 import loader
@@ -39,7 +34,6 @@ def main():
 	manager.manager.restoresession()
 	manager.manager.startup()
 	settings.get("loop")()
-	#settings.pop("loop")()
 
 
 
diff --git a/src/base/settings.py b/src/base/settings.py
index 591f588e..a16ca72e 100644
--- a/src/base/settings.py
+++ b/src/base/settings.py
@@ -112,15 +112,16 @@ def parseInput():
 
 
 def clean():
-	delete("user")
+	delete("appname")
 	delete("arch")
-	delete("write")
 	delete("args")
-	delete("plugpath")
-	delete("verbose")
 	delete("loop")
 	delete("loopquit")
-
+	delete("plugpath")
+	delete("user")
+	delete("verbose")
+	delete("write")
+	
 
 def save(path):
 	clean()