r20777 - in /branches/relax_disp: ./ gui/wizards/peak_intensity.py -- September 03, 2013 - 17:41

Author: bugman
Date: Tue Sep  3 17:41:49 2013
New Revision: 20777

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

........
  r20775 | bugman | 2013-09-03 17:36:03 +0200 (Tue, 03 Sep 2013) | 6 lines
  
  The peak intensity wizard in the GUI is now more robust.
  
  The wizard_update_ids() method can now better handle missing data.  This is 
encountered if a user
  skips the first elements of the wizard.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/gui/wizards/peak_intensity.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep  3 17:41:49 2013
@@ -1,1 +1,1 @@
-/trunk:1-20759
+/trunk:1-20775

Modified: branches/relax_disp/gui/wizards/peak_intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/gui/wizards/peak_intensity.py?rev=20777&r1=20776&r2=20777&view=diff
==============================================================================
--- branches/relax_disp/gui/wizards/peak_intensity.py (original)
+++ branches/relax_disp/gui/wizards/peak_intensity.py Tue Sep  3 17:41:49 2013
@@ -265,6 +265,11 @@
 
         # Handle list arguments.
         if isinstance(id, list):
+            # If an empty list is encountered, exit this method without 
doing anything.
+            if id == []:
+                return
+
+            # Use only the first element.
             id = id[0]
 
         # Set the ID in the page.