summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>1998-05-07 13:08:58 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>1998-05-07 13:08:58 (GMT)
commit0072b8d994264ab413d5e52ddfe4a666a671aa2f (patch)
treec5bc3ad273e46e7063bfa642f1da90c7b6d0a9fa /Mac
parent4775d0a353b4983191925cc3d474fb0c324621dd (diff)
downloadcpython-0072b8d994264ab413d5e52ddfe4a666a671aa2f.zip
cpython-0072b8d994264ab413d5e52ddfe4a666a671aa2f.tar.gz
cpython-0072b8d994264ab413d5e52ddfe4a666a671aa2f.tar.bz2
An applet with Popt and GUSI preferences but without alis resource
didn't work, because the resource file chain was incomplete when we tried to open the preference file. Fixed.
Diffstat (limited to 'Mac')
-rw-r--r--Mac/Python/macgetpath.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/Mac/Python/macgetpath.c b/Mac/Python/macgetpath.c
index 98abbd8..80918fd 100644
--- a/Mac/Python/macgetpath.c
+++ b/Mac/Python/macgetpath.c
@@ -217,6 +217,7 @@ PyMac_GetPythonDir()
/* First look for an override in the application file */
UseResFile(PyMac_AppRefNum);
handle = (AliasHandle)Get1Resource('alis', PYTHONHOMEOVERRIDE_ID);
+ UseResFile(oldrh);
if ( handle != NULL ) {
homerh = PyMac_AppRefNum;
} else {
@@ -230,8 +231,8 @@ PyMac_GetPythonDir()
}
homerh = prefrh;
}
- /* It exists. Resolve it (possibly updating it) */
- if ( ResolveAlias(NULL, handle, &dirspec, &modified) != noErr ) {
+ /* It exists. Resolve it (possibly updating it) */
+ if ( ResolveAlias(NULL, handle, &dirspec, &modified) != noErr ) {
(void)StopAlert(BADPREFFILE_ID, NULL);
diditbefore=1;
return ":";