Rev 550 | Rev 553 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 550 | Rev 552 | ||
|---|---|---|---|
| Line 320... | Line 320... | ||
| 320 | extern int previewerr; |
320 | extern int previewerr; |
| 321 | 321 | ||
| 322 | StandardFileReply sfr; |
322 | StandardFileReply sfr; |
| 323 | NavReplyRecord reply; |
323 | NavReplyRecord reply; |
| 324 | static OSType types[] = {TEXT_FILETYPE,PS_FILTER_FILETYPE}; |
324 | static OSType types[] = {TEXT_FILETYPE,PS_FILTER_FILETYPE}; |
| 325 | TCHAR*reason = NULL; |
- | |
| 326 | HINSTANCE hShellRes; |
325 | HINSTANCE hShellRes; |
| 327 | InternalState bakState; |
326 | InternalState bakState; |
| 328 | 327 | ||
| 329 | switch(item){ |
328 | switch(item){ |
| 330 | #ifdef MAC_ENV |
329 | #ifdef MAC_ENV |
| Line 409... | Line 408... | ||
| 409 | 408 | ||
| 410 | free(filters); |
409 | free(filters); |
| 411 | free(title); |
410 | free(title); |
| 412 | 411 | ||
| 413 | if (loadDlgRet) { |
412 | if (loadDlgRet) { |
| - | 413 | FFLoadingResult res; |
|
| - | 414 | ||
| 414 | // Backup everything, otherwise we might lose parameter data if the loading fails |
415 | // Backup everything, otherwise we might lose parameter data if the loading fails |
| 415 | bakState = saveInternalState(); |
416 | bakState = saveInternalState(); |
| 416 | 417 | ||
| 417 | if (loadfile(&sfr, &reason)) { |
418 | if (0 == (res = loadfile(&sfr))) { |
| 418 | updatedialog(dp); |
419 | updatedialog(dp); |
| 419 | maindlgupdate(dp); |
420 | maindlgupdate(dp); |
| 420 | } |
421 | } |
| 421 | else { |
422 | else { |
| 422 | alertuser_id(MSG_CANNOT_LOAD_SETTINGS_ID, reason); |
- | |
| 423 | - | ||
| 424 | // Restore |
423 | // Restore |
| 425 | restoreInternalState(bakState); |
424 | restoreInternalState(bakState); |
| - | 425 | ||
| - | 426 | if (res == MSG_FFL_CONVERTED_ID) { |
|
| - | 427 | showmessage_id(res); |
|
| - | 428 | } |
|
| - | 429 | else { |
|
| - | 430 | TCHAR* reason = FF_GetMsg_Cpy(res); |
|
| - | 431 | alertuser_id(MSG_CANNOT_LOAD_SETTINGS_ID, reason); |
|
| - | 432 | FF_GetMsg_Free(reason); |
|
| - | 433 | } |
|
| 426 | } |
434 | } |
| 427 | if (reason) FF_GetMsg_Free(reason); |
- | |
| 428 | } |
435 | } |
| 429 | break; |
436 | break; |
| 430 | } |
437 | } |
| 431 | case SAVEITEM: |
438 | case SAVEITEM: |
| 432 | { |
439 | { |