Author: bugman Date: Thu Oct 23 12:02:56 2014 New Revision: 26377 URL: http://svn.gna.org/viewcvs/relax?rev=26377&view=rev Log: Merged revisions 26374 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r26374 | bugman | 2014-10-23 12:01:49 +0200 (Thu, 23 Oct 2014) | 7 lines Fix for the structure.com user function. This fixes bug #22860 (https://gna.org/bugs/?22860), the failure of the structure.com user function after calling structure.delete. The number of models in cdp.structure is now counted and if set to zero, RelaxNoPdbError will be raised. ........ Modified: branches/space_mapping_refactor/ (props changed) branches/space_mapping_refactor/pipe_control/structure/mass.py Propchange: branches/space_mapping_refactor/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Thu Oct 23 12:02:56 2014 @@ -1 +1 @@ -/trunk:1-26370,26373 +/trunk:1-26370,26373-26374 Modified: branches/space_mapping_refactor/pipe_control/structure/mass.py URL: http://svn.gna.org/viewcvs/relax/branches/space_mapping_refactor/pipe_control/structure/mass.py?rev=26377&r1=26376&r2=26377&view=diff ============================================================================== --- branches/space_mapping_refactor/pipe_control/structure/mass.py (original) +++ branches/space_mapping_refactor/pipe_control/structure/mass.py Thu Oct 23 12:02:56 2014 @@ -44,7 +44,7 @@ """ # Test if a structure has been loaded. - if not hasattr(cdp, 'structure'): + if not hasattr(cdp, 'structure') or cdp.structure.num_models() == 0: raise RelaxNoPdbError # The selection object.