diff --git a/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h
index 9cf3dff9d..4e4927c0f 100644
--- a/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h
+++ b/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h
@@ -81,8 +81,7 @@ public:
 	bool SetTeletextPid(int /*pid*/){return true;}
 	int GetAPid(){return 0;}
 	void GetMetadata(std::vector<std::string> /*&keys*/, std::vector<std::string> /*&values*/){};
-}
-}
+
 };
 
 #endif // __PLAYBACK_CS_H_
diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp
index 0fdfb1ccb..29cdbc934 100644
--- a/src/driver/screenshot.cpp
+++ b/src/driver/screenshot.cpp
@@ -718,12 +718,23 @@ void CScreenShot::cleanupThread(void *arg)
 	delete scs;
 }
 
-//	printf("[CScreenShot::%s:%d] thread: %p\n", __func__, __LINE__, scs);
-delete scs;
-}
 
+
+#if HAVE_COOL_HARDWARE
+/* start ::run in new thread to save file in selected format */
+bool CScreenShot::Start()
+{
+	set_threadname("n:screenshot");
+	bool ret = false;
+	if (GetData())
+		ret = startThread();
+	else
+		delete this;
+	return ret;
+	}
+
+#else
 /* start ::run in new thread to save file in selected format */
-#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
 bool CScreenShot::Start(const std::string custom_cmd)
 {
 	std::string cmd = "/bin/grab ";
@@ -762,19 +773,6 @@ bool CScreenShot::Start(const std::string custom_cmd)
 	system(cmd.c_str());
 	return true;
 }
-#else
-
-/* start ::run in new thread to save file in selected format */
-bool CScreenShot::Start()
-{
-	set_threadname("n:screenshot");
-	bool ret = false;
-	if (GetData())
-		ret = startThread();
-	else
-		delete this;
-	return ret;
-	}
 #endif
 
 /* save file in sync mode, return true if save ok, or false */
diff --git a/src/driver/screenshot.h b/src/driver/screenshot.h
index 461d245a3..2200e5caa 100644
--- a/src/driver/screenshot.h
+++ b/src/driver/screenshot.h
@@ -23,6 +23,10 @@
 #ifndef __screenshot_h_
 #define __screenshot_h_
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <pthread.h>
 
 class CScreenShot
@@ -77,10 +81,10 @@ class CScreenShot
 		void EnableVideo(bool enable) { get_video = enable; }
 		void EnableOSD(bool enable) { get_osd = enable; }
 		void ScaleToVideo(bool enable) { scale_to_video = enable; }
-#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
-		bool Start(const std::string custom_cmd = "");
-#else
+#if HAVE_COOL_HARDWARE
 		bool Start();
+#else
+		bool Start(const std::string custom_cmd = "");
 #endif
 		bool StartSync();
 };
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index d56f65d9d..77714d27c 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -3520,7 +3520,7 @@ void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
 			sc->SetSize(w, h);
 		}
 	}
-#if ! HAVE_COOL_HARDWARE
+#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
 	sc->Start("-r 320 -j 75");
 #else
 	sc->Start();