aboutsummaryrefslogtreecommitdiff
path: root/pd/src/s_main.c
diff options
context:
space:
mode:
authorMiller Puckette <millerpuckette@users.sourceforge.net>2008-05-22 18:25:27 +0000
committerMiller Puckette <millerpuckette@users.sourceforge.net>2008-05-22 18:25:27 +0000
commit619bf2d74ef3e5431cb6057698f324590368122b (patch)
tree6f94196bba4a6bd11bb51b2feb598e7d242aec16 /pd/src/s_main.c
parent7007d5067b69480ad5d61edee496a50b6114a0c1 (diff)
0.42-0 test 01. No real work yet, just bug fixes and updates.
svn path=/trunk/; revision=9867
Diffstat (limited to 'pd/src/s_main.c')
-rw-r--r--pd/src/s_main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/pd/src/s_main.c b/pd/src/s_main.c
index 877ed41f..dcc3bed9 100644
--- a/pd/src/s_main.c
+++ b/pd/src/s_main.c
@@ -282,7 +282,8 @@ int sys_main(int argc, char **argv)
if (!noprefs)
sys_loadpreferences(); /* load default settings */
#ifndef MSW
- sys_rcfile(); /* parse the startup file */
+ if (!noprefs)
+ sys_rcfile(); /* parse the startup file */
#endif
if (sys_argparse(argc-1, argv+1)) /* parse cmd line */
return (1);