From f71325458499ffae8492852e7ecf9020aeeb5156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 21 Mar 2015 19:21:06 +0100 Subject: [PATCH] merged --- compressed_archive/compressed_archive.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compressed_archive/compressed_archive.cpp b/compressed_archive/compressed_archive.cpp index 0e47876d..83d1895e 100644 --- a/compressed_archive/compressed_archive.cpp +++ b/compressed_archive/compressed_archive.cpp @@ -199,7 +199,7 @@ bool CompressedArchive::loadFunctions() { #if defined Q_OS_UNIX #if defined Q_OS_MAC - rarLib = new QLibrary(QApplication::applicationDirPath()+"/utils/Codecs/Rar29"); + rarLib = new QLibrary(QCoreApplication::applicationDirPath()+"/utils/Codecs/Rar29"); #else //check if a yacreader specific version of p7zip exists on the system QFileInfo rarCodec(QString(LIBDIR)+"/yacreader/Codecs/Rar29.so"); @@ -215,7 +215,7 @@ bool CompressedArchive::loadFunctions() if(!rarLib->load()) { 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; } #endif