Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/app.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,9 @@ XxApp::XxApp( int& argc, char** argv, XxCmdline& cmdline ) :
{
_editProc[0] = _editProc[1] = _editProc[2] = NULL;

// Initialize default resource before doing anything else
_defres = new XxResources( _cmdline._originalXdiff );

// Read in the resources and create resources object.
_resources = buildResources();

Expand Down Expand Up @@ -3280,10 +3283,7 @@ void XxApp::saveOptions()
{
// Save to the stream the differences with the default resources.
QTextStream outs( &outstr, QIODevice::WriteOnly );
std::unique_ptr<XxResources> defres(
new XxResources( _cmdline._originalXdiff )
);
XxResParser::genInitFile( *_resources, *defres, outs );
XxResParser::genInitFile( *_resources, *_defres, outs );
}
if ( outstr.isEmpty() ) {
new XxSuicideMessageBox(
Expand Down
1 change: 1 addition & 0 deletions src/app.h
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,7 @@ public slots:
// True if there is even a single byte of difference between the files.
bool _isThereAnyDifference;

XxResources* _defres;
XxResources* _resources;

// Data from parsing the cmdline.
Expand Down