r13642 - in /branches/gui_testing: ./ data/__init__.py -- July 15, 2011 - 12:38

Author: bugman
Date: Fri Jul 15 12:38:25 2011
New Revision: 13642

URL: http://svn.gna.org/viewcvs/relax?rev=13642&view=rev
Log:
Merged revisions 13641 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r13641 | bugman | 2011-07-15 12:25:21 +0200 (Fri, 15 Jul 2011) | 3 lines
  
  Fix for the new relax save state with current pipe info - the cdp ojbect is 
now set after loading.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/data/__init__.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 15 12:38:25 2011
@@ -1,1 +1,1 @@
-/1.3:1-13632
+/1.3:1-13641

Modified: branches/gui_testing/data/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/data/__init__.py?rev=13642&r1=13641&r2=13642&view=diff
==============================================================================
--- branches/gui_testing/data/__init__.py (original)
+++ branches/gui_testing/data/__init__.py Fri Jul 15 12:38:25 2011
@@ -313,6 +313,10 @@
                 # Fill the pipe.
                 self[pipe_name].from_xml(pipe_node, 
file_version=file_version, dir=dir)
 
+            # Set the current pipe.
+            if self.current_pipe in self.keys():
+                __builtin__.cdp = self[self.current_pipe]
+
 
     def to_xml(self, file, pipes=None):
         """Create a XML document representation of the current data pipe.