Author: bugman Date: Mon Aug 22 14:46:03 2011 New Revision: 14401 URL: http://svn.gna.org/viewcvs/relax?rev=14401&view=rev Log: Merged r14393 in from the gui_testing branch as the change should have been in the main line. The command used was: svn merge -r14393:14394 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/gui_testing . ..... r14394 | bugman | 2011-08-16 21:13:44 +0200 (Tue, 16 Aug 2011) | 5 lines Changed paths: M /branches/gui_testing/relax.py Fix for the GUI mode setting which was broken in r14393. The multi-processor code merger caused this to be an issue, as the mode is now a class variable. ..... Modified: 1.3/relax.py Modified: 1.3/relax.py URL: http://svn.gna.org/viewcvs/relax/1.3/relax.py?rev=14401&r1=14400&r2=14401&view=diff ============================================================================== --- 1.3/relax.py (original) +++ 1.3/relax.py Mon Aug 22 14:46:03 2011 @@ -384,7 +384,7 @@ parser.error("To use the GUI, the wx python module must be installed.") # Set the mode. - mode = 'gui' + self.mode = 'gui' # Script mode. elif self.script_file: