fix

Author: Mysticial

Common/Cpp/Json/JsonObject.h

@@ -19,12 +19,14 @@ class JsonObject{
     JsonObject(JsonObject&& x) = default;
     JsonObject& operator=(JsonObject&& x) = default;
 
-    bool operator==(const JsonObject& x){ // TODO: implement == properly. For JsonValue as well.
-        return dump() == x.dump();
+    //  TODO: implement == properly. For JsonValue as well.
+    friend bool operator==(const JsonObject& x, const JsonObject& y){
+        return x.dump() == y.dump();
     }
-    bool operator!=(const JsonObject& x){
-        return !(*this == x);
+    friend bool operator!=(const JsonObject& x, const JsonObject& y){
+        return !(x == y);
     }
+
 private:
     //  Private to avoid accidental copying.
     JsonObject(const JsonObject& x);

Common/Qt/Redispatch.cpp

@@ -10,6 +10,10 @@
 #include <QApplication>
 #include "Redispatch.h"
 
+//#include <iostream>
+//using std::cout;
+//using std::endl;
+
 namespace PokemonAutomation{
 
 
@@ -31,16 +35,24 @@ void run_on_object_thread_and_wait(QObject* object, std::function<void()> lambda
         return;
     }
 
+//    static int c = 0;
+//    c++;
+
     std::mutex lock;
     std::condition_variable cv;
     bool done = false;
+//    cout << c << ": " << "Invoking..." << endl;
     QMetaObject::invokeMethod(object, [&]{
+//        cout << c << ": " << "Running Lambda..." << endl;
         lambda();
+//        cout << c << ": " << "Running Lambda... Done" << endl;
         std::lock_guard<std::mutex> lg(lock);
         done = true;
         cv.notify_all();
     });
+//    cout << c << ": " << "Invoking... Done" << endl;
     std::unique_lock<std::mutex> lg(lock);
+//    cout << c << ": " << "Waiting..." << endl;
     cv.wait(lg, [&]{ return done; });
 }