Merge pull request #168 from Yureien/master

Fix build if ImageMagick is not installed

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1.0) # Threads::Threads
 
 project(fastfetch
-    VERSION 1.5.0
+    VERSION 1.5.2
     LANGUAGES C
 )
 

README.md

@@ -85,20 +85,21 @@ fastfetch uses [`cmake`](https://cmake.org/) and [`pkg-config`](https://www.free
 mkdir -p build
 cd build
 cmake ..
-cmake --build . -j$(nproc) --target fastfetch --target flashfetch
+cmake --build . --target fastfetch --target flashfetch
 ```
 
 If pkg-config fails to find the headers for a library listed in [dependencies](#dependencies), fastfetch will simply build without support for that specific feature. This means, it won't look for it at runtime and just act like it isn't available.
 
 ## Packaging
 
-* [AUR](https://aur.archlinux.org/packages/fastfetch-git/): Packaged by me. Will install the fastfetch binary, bash completion and the presets. Git version
-* [Manjaro Repositories](https://gitlab.manjaro.org/packages/community/fastfetch): Packaged by a manjaro maintainer. Usually a bit outdated.
-* [Gentoo (Guru)](https://github.com/gentoo/guru/tree/master/app-misc/fastfetch): Packed by some other guy. May be out of date some times.
-* DEB / RPM: Run `cmake -B build && cmake --build build --target package` to build the packages in build.
-* Manually:
-    * Build: Follow the [build instructions](#building).
-    * Install: `sudo cmake --install build --prefix /usr/local`
+[![Packaging status](https://repology.org/badge/vertical-allrepos/fastfetch.svg)](https://repology.org/project/fastfetch/versions)
+
+### Manual
+
+Build: Follow the [build instructions](#building).
+
+* Create DEB / RPM: Run `cmake --build . --target package`.
+* Install directly: Run `sudo cmake --install . --prefix /usr/local`
 
 ## FAQ
 

src/logo/image/image.c

@@ -563,7 +563,7 @@ bool ffLogoPrintImageIfExists(FFinstance* instance, FFLogoType type)
 }
 
 #else //FF_HAVE_IMAGEMAGICK{6, 7}
-FFLogoImageResult ffLogoPrintImageIfExists(FFinstance* instance, FFLogoType type)
+bool ffLogoPrintImageIfExists(FFinstance* instance, FFLogoType type)
 {
     FF_UNUSED(instance, type);
     return false;

src/logo/logo.c

@@ -365,7 +365,9 @@ void ffLogoBuiltinPrint(FFinstance* instance)
         logoPrintStruct(instance, logo);
         ffLogoPrintRemaining(instance);
 
+        //reset everything
         instance->state.logoHeight = 0;
+        instance->state.keysHeight = 0;
         for(uint8_t i = 0; i < FASTFETCH_LOGO_MAX_COLORS; i++)
             ffStrbufClear(&instance->config.logoColors[i]);