← Back to branch summary

~ubuntu-branches/ubuntu/vivid/unrar-nonfree/vivid

« back to all changes in this revision

Viewing changes to rar.cpp

  • Committer: Package Import Robot
  • Author(s): Martin Meredith
  • Date: 2015-02-03 12:58:01 UTC
  • mfrom: (1.1.18) (5.1.18 sid)
  • Revision ID: package-import@ubuntu.com-20150203125801-od6ev8cqy1er51vz
Tags: 1:5.2.5-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
rar.cpp
69
69
    ShutdownOnClose=Cmd->Shutdown;
70
70
#endif
71
71
 
72
 
    InitConsoleOptions(Cmd->MsgStream,Cmd->Sound);
 
72
    uiInit(Cmd->Sound);
 
73
    InitConsoleOptions(Cmd->MsgStream);
73
74
    InitLogOptions(Cmd->LogName,Cmd->ErrlogCharset);
74
75
    ErrHandler.SetSilent(Cmd->AllYes || Cmd->MsgStream==MSG_NULL);
75
76
    ErrHandler.SetShutdown(Cmd->Shutdown);
82
83
  {
83
84
    ErrHandler.SetErrorCode(ErrCode);
84
85
  }
85
 
  catch (std::bad_alloc)
 
86
  catch (std::bad_alloc&)
86
87
  {
87
88
    ErrHandler.MemoryErrorMsg();
88
89
    ErrHandler.SetErrorCode(RARX_MEMORY);