Merge pull request #248 from MultiMC/feature_fix_ftb_lib

Fix FTB local libraries bug

logic/OneSixLibrary.cpp

@@ -148,22 +148,23 @@ QStringList OneSixLibrary::files()
 	{
 		QString cooked_storage = storage;
 		cooked_storage.replace("${arch}", "32");
-		retval.append(PathCombine("libraries", cooked_storage));
+		retval.append(cooked_storage);
 		cooked_storage = storage;
 		cooked_storage.replace("${arch}", "64");
-		retval.append(PathCombine("libraries", cooked_storage));
+		retval.append(cooked_storage);
 	}
 	else
-		retval.append(PathCombine("libraries", storage));
+		retval.append(storage);
 	return retval;
 }
 
-bool OneSixLibrary::filesExist()
+bool OneSixLibrary::filesExist(const QDir &base)
 {
 	auto libFiles = files();
 	for(auto file: libFiles)
 	{
-		QFileInfo info(file);
+		QFileInfo info(base, file);
+		QLOG_WARN() << info.absoluteFilePath() << "doesn't exist";
 		if (!info.exists())
 			return false;
 	}

logic/OneSixLibrary.h

@@ -19,6 +19,7 @@
 #include <QStringList>
 #include <QMap>
 #include <QJsonObject>
+#include <QDir>
 #include <memory>
 
 #include "logic/net/URLConstants.h"
@@ -142,6 +143,6 @@ public:
 	QString hint() const;
 
 	bool extractTo(QString target_dir);
-	bool filesExist();
+	bool filesExist(const QDir &base);
 	QStringList files();
 };

logic/OneSixUpdate.cpp

@@ -274,7 +274,7 @@ void OneSixUpdate::jarlibStart()
 	{
 		if (lib->hint() == "local")
 		{
-			if(!lib->filesExist())
+			if(!lib->filesExist(m_inst->librariesPath()))
 				brokenLocalLibs.append(lib);
 			continue;
 		}