mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-03-21 19:21:22 +01:00
commit 8d29b556a8
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compressed_archive/compressed_archive.cpp
View File

@ -177,16 +177,12 @@ CompressedArchive::CompressedArchive(const QString & filePath, QObject *parent)
CompressedArchive::~CompressedArchive() CompressedArchive::~CompressedArchive()
{ {
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
if(isRar) //TODO: fix this!!! Possible memory leak. If AddRef is not used, a crash occurs in "delete szInterface" if(isRar) //TODO: fix this!!! Possible memory leak. If AddRef is not used, a crash occurs in "delete szInterface"
szInterface->archive->AddRef(); szInterface->archive->AddRef();
#endif #endif
if(valid) //TODO: fix this!!! Memory leak. if(valid) //TODO: fix this!!! Memory leak.
{
szInterface->archive->Close();
delete szInterface; delete szInterface;
}
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
delete rarLib; delete rarLib;
#endif #endif
@ -203,7 +199,7 @@ bool CompressedArchive::loadFunctions()
{ {
#if defined Q_OS_UNIX #if defined Q_OS_UNIX
#if defined Q_OS_MAC #if defined Q_OS_MAC
rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29"); rarLib = new QLibrary(QCoreApplication::applicationDirPath()+"/utils/Codecs/Rar29");
#else #else
//check if a yacreader specific version of p7zip exists on the system //check if a yacreader specific version of p7zip exists on the system
QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so"); QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so");
@ -219,7 +215,7 @@ bool CompressedArchive::loadFunctions()
if(!rarLib->load()) if(!rarLib->load())
{ {
qDebug() << "Error Loading Rar29.so : " + rarLib->errorString() << endl; qDebug() << "Error Loading Rar29.so : " + rarLib->errorString() << endl;
QApplication::exit(YACReader::SevenZNotFound); QCoreApplication::exit(700); //TODO yacreader_global can't be used here, it is GUI dependant, YACReader::SevenZNotFound
return false; return false;
} }
#endif #endif