--- SharedRasmol.py (OLD FILE) 2005-08-24 15:51:30.000000000 +1000
+++ SharedRasmol.py (NEW FILE) 2005-08-18 15:48:23.000000000 +1000
@@ -105,7 +105,7 @@
         wxPanel.__init__(self, parent, id)
 
         self.app = app
-        
+      
         self.sizer = wxBoxSizer(wxVERTICAL)
 
         self.leaderText = wxStaticText(self, -1, "Leader:                          ")
@@ -262,8 +262,10 @@
         
         self.lastRotTime = 0
         self.lastDialTime = 0
-        threading.Thread(target=self.VenueSyncThread).start()
-        
+
+        self.SyncAppState()
+
+        threading.Thread(target=self.VenueSyncThread).start()        
         
     def SyncAppState(self):
     
@@ -272,7 +274,7 @@
         #
         filename = self.app.GetData(self.privId,"filename")
         if filename:
-            try:
+            try: 
                 self.LoadFile(filename)
             except DataStoreClient.FileNotFound:
                 log.exception( "File %s not found" ,filename)
@@ -312,7 +314,7 @@
             try:
                 self.SetColour(colourSetting)
             except:
-                log.exception( "Failed to sync colour setting")
+                log. exception( "Failed to sync colour setting")
        
         #
         # Set the option
@@ -324,10 +326,11 @@
             except:
                 log.exception( "Failed to sync option setting")
 
+    def SyncLeadState(self):
         # Set the name of the leader
         leader = self.app.GetData(self.privId,"leader")
         if leader:
-            self.gui.SetLeaderName(leader)
+           self.gui.SetLeaderName(leader)
 
 
     def SetGUI(self, gui):
@@ -374,7 +377,7 @@
         
         self.pubId, self.privId = self.app.Join()
 
-        log.info( "Joined: privId=%s pubId=%s", self.privId, self.pubId)
+        log.info( "Joine d: privId=%s pubId=%s", self.privId, self.pubId)
 
     def ConnectToEC(self):
         """
@@ -387,10 +390,10 @@
 
         self.eventClient = EventClient.EventClient(self.privId,
                                                    (ehost, eport),
-                                                   self.channelId)
+                                                    self.channelId)
         self.eventClient.start()
         self.eventClient.Send(Events.ConnectEvent(self.channelId,
-                                                  self.privId))
+                                                   self.privId))
 
     def RegisterECHandlers(self):
         """
@@ -419,7 +422,7 @@
                                           self.OnRemoteTakeLead)
 
         self.eventClient.RegisterCallback("RelinquishLead",
-                                          self.OnRemoteRelinquishLead)
+                                           self.OnRemoteRelinquishLead)
         
 
     def StartRasmol(self):
@@ -442,10 +445,10 @@
         self.rasmolPort = info[1]
 
         log.info( "Chose port %s", str(self.rasmolPort))
-
+        
         self.rasmolPID = self.pm.StartProcess(self.rasmolPath,
-                                   ["-port", str(self.rasmolPort) ])
-
+                                ["-port", str(self.rasmolPort),
+                                "-sharedapp"])
         self.rasmolComm = RasmolComm.RasmolComm("localhost", self.rasmolPort, self)
 
         #
@@ -477,7 +480,7 @@
                                                        [self.pubId, self.dials]))
                     self.lastDialTime = 0
 
-            time.sleep(.5)
+            time.sleep(.5) 
 
     ##########################################
     #
@@ -535,7 +538,7 @@
             self.rasmolComm.loadFile(local)
         else:
             log.info( "Can't load file %s", local)
-            
+        
     def SetRotation(self,rotation):
         self.rasmolComm.setRotate(None, rotation)
 
@@ -657,7 +660,7 @@
         Ignore data from this process.
         
         """
-        
+
         if event.data[0] == self.pubId:
             return
 
@@ -816,7 +819,7 @@
 
     rasmolApp.SetGUI(guiFrame.panel)
     
-    rasmolApp.SyncAppState()
+    rasmolApp.SyncLeadState()
 
     guiFrame.Show(1)
     wxapp.SetTopWindow(guiFrame)