r10595 - /branches/bieri_gui/gui_bieri/analyses/auto_model_free.py -- January 29, 2010 - 13:47

Author: bugman
Date: Fri Jan 29 13:47:14 2010
New Revision: 10595

URL: http://svn.gna.org/viewcvs/relax?rev=10595&view=rev
Log:
Modified the data checking at the start of automatic_protocol_controller().


Modified:
    branches/bieri_gui/gui_bieri/analyses/auto_model_free.py

Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_model_free.py?rev=10595&r1=10594&r2=10595&view=diff
==============================================================================
--- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
+++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Fri Jan 29 
13:47:14 2010
@@ -607,19 +607,13 @@
         @type event:    wx event
         """
 
-        # Dialog for selecting which global model the protocol should solve.
-        checkpoint = self.check_entries()
+        # The required data has not been set up correctly or has not all 
been given, so clean up and exit.
+        if not self.check_entries():
+            event.Skip()
+            return
 
         # Synchronise the frame data to the relax data store.
         self.sync_ds(upload=True)
-
-        # The required data has not been set up correctly or has not all 
been given, so clean up and exit.
-        if checkpoint == False:
-            # Skip the event.
-            event.Skip()
-
-            # Exit.
-            return
 
         # The global model.
         which_model = self.choose_global_model(False)