Fixed #39

camera/Camera.cc

@@ -167,6 +167,13 @@ bool Camera::stop()
 			return true;
 		}
 		this->logger->log("Error stopping video recording.");
+
+		if ( ! this->is_really_recording())
+		{
+			this->logger->log("Warning: error was already stopped.");
+			this->recording = false;
+			return true;
+		}
 		return false;
 	#else
 		this->logger->log("Test mode. Video recording stop simulated.");
@@ -175,6 +182,17 @@ bool Camera::stop()
 	#endif
 }
 
+bool Camera::is_really_recording() const
+{
+	FILE* process = popen("pgrep raspivid", "r");
+	char response[5];
+	fgets(response, 5, process);
+	pclose(process);
+
+	if (process == NULL) this->logger->log("Error checking if raspivid is really recording");
+	return (process != NULL && response != NULL);
+}
+
 int os::get_file_count(const string& path)
 {
 	DIR *dp;

camera/Camera.h

@@ -17,6 +17,7 @@ namespace os {
 		bool recording = false;
 		Camera();
 		void record_thread(int time);
+		bool is_really_recording() const;
 	public:
 		Camera(Camera& copy) = delete;
 		~Camera();