Fix mac crash

Author: atoko

ResourceManager.cpp

@@ -120,6 +120,10 @@ ResourceManager::ResourceManager()
     detection_percent           = 100;
     detection_string            = "";
     detection_is_required       = false;
+<<<<<<< HEAD
+=======
+    DetectDevicesThread         = nullptr;
+>>>>>>> 86ad1582 (Fix mac crash)
     dynamic_detectors_processed = false;
     init_finished               = false;
     background_thread_running    = true;
@@ -227,6 +231,7 @@ ResourceManager::ResourceManager()
 ResourceManager::~ResourceManager()
 {
     Cleanup();
+<<<<<<< HEAD
 
     // Mark the background detection thread as not running
     // And then wake it up so it knows that it has to stop
@@ -240,6 +245,8 @@ ResourceManager::~ResourceManager()
         delete DetectDevicesThread;
         DetectDevicesThread = nullptr;
     }
+=======
+>>>>>>> 86ad1582 (Fix mac crash)
 }
 
 void ResourceManager::RegisterI2CBus(i2c_smbus_interface *bus)
@@ -1665,11 +1672,14 @@ void ResourceManager::Initialize(bool tryConnect, bool detectDevices, bool start
     start_server       = startServer;
     apply_post_options = applyPostOptions;
 
+<<<<<<< HEAD
     RunInBackgroundThread(std::bind(&ResourceManager::InitCoroutine, this));
 }
 
 void ResourceManager::InitCoroutine()
 {
+=======
+>>>>>>> 86ad1582 (Fix mac crash)
     if(tryAutoConnect)
     {
         detection_percent = 0;

ResourceManager.h

@@ -290,7 +290,11 @@ class ResourceManager: public ResourceManagerInterface
     /*-------------------------------------------------------------------------------------*\
     | Detection Thread and Detection State                                                  |
     \*-------------------------------------------------------------------------------------*/
+<<<<<<< HEAD
     std::thread *                               DetectDevicesThread;
+=======
+    std::thread *                               DetectDevicesThread; // Used for rescan
+>>>>>>> 86ad1582 (Fix mac crash)
     std::mutex                                  DetectDeviceMutex;
     std::function<void()>                       ScheduledBackgroundFunction;
     std::mutex                                  BackgroundThreadStateMutex;