r25187 - in /branches/frame_order_cleanup: ./ gui/analyses/__init__.py -- August 21, 2014 - 18:43

Author: bugman
Date: Thu Aug 21 18:43:26 2014
New Revision: 25187

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

........
  r25185 | bugman | 2014-08-21 18:33:05 +0200 (Thu, 21 Aug 2014) | 6 lines
  
  Fix for bug #22501 (https://gna.org/bugs/?22501), "Close all analyses" 
raises error in the GUI.
  
  The problem was general for all analysis types.  This used to work, but as 
it was not tested in the
  test suite, a regression occurred.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/gui/analyses/__init__.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 21 18:43:26 2014
@@ -1 +1 @@
-/trunk:1-25182,25184
+/trunk:1-25186

Modified: branches/frame_order_cleanup/gui/analyses/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/gui/analyses/__init__.py?rev=25187&r1=25186&r2=25187&view=diff
==============================================================================
--- branches/frame_order_cleanup/gui/analyses/__init__.py       (original)
+++ branches/frame_order_cleanup/gui/analyses/__init__.py       Thu Aug 21 
18:43:26 2014
@@ -129,6 +129,8 @@
         # No current page.
         if self._current == None:
             return
+        if len(ds.relax_gui.analyses) == 0:
+            return
 
         # Return the name.
         return ds.relax_gui.analyses[self._current]
@@ -144,6 +146,8 @@
         # No current page.
         if self._current == None:
             return
+        if len(ds.relax_gui.analyses) == 0:
+            return
 
         # Return the name.
         return ds.relax_gui.analyses[self._current].analysis_name
@@ -158,6 +162,8 @@
 
         # No current page.
         if self._current == None:
+            return
+        if len(ds.relax_gui.analyses) == 0:
             return
 
         # Return the name.