Skip to content

Commit

Permalink
ok assignment breaks tests on Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
@JarrettSJohnson
JarrettSJohnson committed May 12, 2024
1 parent 5f0106a commit 63b7438
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion layer2/ObjectMolecule.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2388,7 +2388,7 @@ static ObjectMolecule *ObjectMoleculeReadTOPStr(PyMOLGlobals * G, ObjectMolecule
*/

if(ok && isNew)
ok &= ObjectMoleculeConnect(I, cset, false);
ok = ObjectMoleculeConnect(I, cset, false);
if(cset->Symmetry && (!I->Symmetry)) {
I->Symmetry.reset(new CSymmetry(*cset->Symmetry));
CHECKOK(ok, I->Symmetry);
Expand Down

2 comments on commit 63b7438

@JarrettSJohnson
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's probably something funky going on in ObjectMoleculeConnect

@speleo3
Copy link
Contributor

@speleo3 speleo3 commented on 63b7438 May 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's probably something funky going on in ObjectMoleculeConnect

more likely the CHECKOK macro which does ok &= var without casting var to bool

Edit: Sorry that was wrong, it does actually convert to bool

Please sign in to comment.