Hardware Monitor (windows) now always starting worker thread for heartbeat message

Author: gizmocuz

hardware/HardwareMonitor.cpp

@@ -80,10 +80,8 @@ bool CHardwareMonitor::StartHardware()
 	StopHardware();
 
 #ifdef WIN32
-	if (!InitWMI())
-		return false;
+	InitWMI();
 #endif
-
 	m_stoprequested = false;
 	m_lastquerytime = 0;
 	m_thread = boost::shared_ptr<boost::thread>(new boost::thread(boost::bind(&CHardwareMonitor::Do_Work, this)));
@@ -361,6 +359,7 @@ void CHardwareMonitor::FetchData()
 		RunWMIQuery("Sensor","Load");
 		RunWMIQuery("Sensor","Fan");
 		RunWMIQuery("Sensor","Voltage");
+		return;
 	}
 #elif defined __linux__
 	_log.Log(LOG_NORM,"Hardware Monitor: Fetching data (System sensors)");
@@ -456,6 +455,8 @@ void CHardwareMonitor::ExitWMI()
 
 bool CHardwareMonitor::IsOHMRunning()
 {
+	if ((m_pServicesOHM == NULL) || (m_pServicesSystem == NULL))
+		return false;
 	bool bOHMRunning = false;
 	IEnumWbemClassObject* pEnumerator = NULL;
 	HRESULT hr;

msbuild/domoticz.sln

@@ -6,9 +6,6 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "domoticz", "domoticz.vcxproj", "{6AD96441-5B2C-467B-AAB6-A1B8368D503A}"
 EndProject
 Global
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Release|Win32 = Release|Win32