Skip to content

Commit

Permalink
Merge branch 'cmake' into cmake_win
Browse files Browse the repository at this point in the history
  • Loading branch information
JarrettSJohnson committed May 11, 2024
2 parents 37cab28 + 5976bc6 commit 8951ed8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions layer4/Cmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -693,12 +693,12 @@ static PyObject * CmdGetCCP4Str(PyObject * self, PyObject * args)
} else {
API_SETUP_PYMOL_GLOBALS;
if (G) {
APIEnter(G);
APIEnterBlocked(G);
auto v = ObjectMapGetCCP4Str(G, name, state, quiet, format);
PyObject * result = v.empty() ? NULL :
PyBytes_FromStringAndSize(&v.front(), v.size());

APIExit(G);
APIExitBlocked(G);
return APIAutoNone(result);
}
}
Expand Down

0 comments on commit 8951ed8

Please sign in to comment.