Rev 381 | Rev 393 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 381 | Rev 389 | ||
|---|---|---|---|
| Line 314... | Line 314... | ||
| 314 | expr[1] = _strdup("g"); |
314 | expr[1] = _strdup("g"); |
| 315 | expr[2] = _strdup("b"); |
315 | expr[2] = _strdup("b"); |
| 316 | expr[3] = _strdup("a"); |
316 | expr[3] = _strdup("a"); |
| 317 | } |
317 | } |
| 318 | 318 | ||
| 319 | savefile_afs_pff(&sfr); |
319 | savefile_afs_pff_picotxt(&sfr); |
| 320 | 320 | ||
| 321 | if (gdata->standalone) { |
321 | if (gdata->standalone) { |
| 322 | for (i = 0; i < 4; i++) { |
322 | for (i = 0; i < 4; i++) { |
| 323 | if (expr[i]) free(expr[i]); |
323 | if (expr[i]) free(expr[i]); |
| 324 | expr[i] = bakexpr[i]; |
324 | expr[i] = bakexpr[i]; |
| 325 | } |
325 | } |
| 326 | } |
326 | } |
| 327 | } else { |
327 | } else { |
| 328 | /* update stored parameters from new user settings */ |
328 | /* update stored parameters from new user settings */ |
| 329 | saveparams(pb->parameters); |
329 | saveparams_afs_pff(pb->parameters); |
| 330 | } |
330 | } |
| 331 | }else |
331 | }else |
| 332 | e = userCanceledErr; |
332 | e = userCanceledErr; |
| 333 | } |
333 | } |
| 334 | wantdialog = false; |
334 | wantdialog = false; |
| Line 419... | Line 419... | ||
| 419 | 419 | ||
| 420 | return true; |
420 | return true; |
| 421 | } |
421 | } |
| 422 | } |
422 | } |
| 423 | 423 | ||
| 424 | if( (bUninitializedParams = !(params && readparams(params,false,&reasonstr))) ){ |
424 | if( (bUninitializedParams = !(params && readparams_afs_pff(params,false,&reasonstr))) ){ |
| 425 | /* either the parameter handle was uninitialised, |
425 | /* either the parameter handle was uninitialised, |
| 426 | or the parameter data couldn't be read; set default values */ |
426 | or the parameter data couldn't be read; set default values */ |
| 427 | 427 | ||
| 428 | // see if saved parameters exist |
428 | // see if saved parameters exist |
| 429 | gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance,&reason,READ_OBFUSC); |
429 | gdata->standalone = gdata->parmloaded = readPARMresource((HMODULE)hDllInstance,&reason,READ_OBFUSC); |
| Line 472... | Line 472... | ||
| 472 | case SCR_NO_SCRIPT: |
472 | case SCR_NO_SCRIPT: |
| 473 | showdialog = bUninitializedParams; |
473 | showdialog = bUninitializedParams; |
| 474 | break; |
474 | break; |
| 475 | } |
475 | } |
| 476 | 476 | ||
| 477 | saveparams(params); |
477 | saveparams_afs_pff(params); |
| 478 | 478 | ||
| 479 | return showdialog; |
479 | return showdialog; |
| 480 | } |
480 | } |
| 481 | 481 | ||
| 482 | Boolean host_preserves_parameters() { |
482 | Boolean host_preserves_parameters() { |