Merge pull request #35 from oblivioncth/dev

Merge to master for v0.7.2

CMakeLists.txt

@@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.24.0...3.26.0)
 # Project
 # NOTE: DON'T USE TRAILING ZEROS IN VERSIONS
 project(FIL
-    VERSION 0.7.1.2
+    VERSION 0.7.2
     LANGUAGES CXX
     DESCRIPTION "Flashpoint Importer for Launchers"
 )
@@ -71,11 +71,11 @@ ob_fetch_qx(
 
 # Fetch libfp (build and import from source)
 include(OB/Fetchlibfp)
-ob_fetch_libfp("v0.4.2.2")
+ob_fetch_libfp("v0.5")
 
 # Fetch CLIFp (build and import from source)
 include(OB/FetchCLIFp)
-ob_fetch_clifp("v0.9.6")
+ob_fetch_clifp("v0.9.7")
 
 # TODO: The shared build of this is essentially useless as only the CLIFp executable
 # is deployed, which only works if it's statically linked. There isn't a simple way

app/src/import-worker.cpp

@@ -642,6 +642,9 @@ ImportWorker::ImportResult ImportWorker::processIcons(Qx::Error& errorReport, co
         for(const Fp::Playlist& p : playlists)
         {
             const QImage& icon = p.icon();
+            if(icon.isNull())
+                continue;
+
             QString filename = p.title() + ".png";
             QString source = iconInflateDir.filePath(filename);
             QString dest = pdd.absoluteFilePath(filename);