Checkpoint

PiPedalCommon/src/include/DBusDispatcher.hpp

@@ -24,7 +24,7 @@ public:
     void Run();
     // Stop everything, shutting down gracefully.
     void Stop();
-    void Wait();
+    void WaitForClose();
     bool IsFinished();
 
     // Stop, but don't wait. Suitable for use in a signal handler.
@@ -78,7 +78,7 @@ private:
     std::atomic<bool> stopping;
 
     std::vector<CallbackEntry> postedEvents;
-    bool threadJoined;
+    bool threadStarted;
     std::thread serviceThread;
     std::mutex postMutex;
 };

PiPedalCommon/src/include/HtmlHelper.hpp

@@ -35,6 +35,9 @@ public:
 
 
     static std::string encode_url_segment(const char*pStart, const char*pEnd, bool isQuerySegment = false);
+    static std::string encode_url_segment(const std::string &segment, bool isQuerySegment = false) {
+        return encode_url_segment(segment.c_str(), segment.c_str() + segment.length(), isQuerySegment);
+    }
     static void encode_url_segment(std::ostream&os, const char*pStart, const char *pEnd, bool isQuerySegment = false);
     static void encode_url_segment(std::ostream&os, const std::string&segment, bool isQuerySegment = false)
     {