Bladeren bron

Revert "src: avoid calling Thread::stop() explicitly"

This reverts commit e42bee4c8f0a56ba3fc371076864d93c2f39c5c1.
Daniele Bartolini 6 jaren geleden
bovenliggende
commit
60fbff0e4f
2 gewijzigde bestanden met toevoegingen van 3 en 0 verwijderingen
  1. 2 0
      src/core/filesystem/file_monitor_linux.cpp
  2. 1 0
      src/resource/resource_loader.cpp

+ 2 - 0
src/core/filesystem/file_monitor_linux.cpp

@@ -118,6 +118,8 @@ struct FileMonitorImpl
 	void stop()
 	void stop()
 	{
 	{
 		_exit = true;
 		_exit = true;
+		_thread.stop();
+
 		close(_fd);
 		close(_fd);
 	}
 	}
 
 

+ 1 - 0
src/resource/resource_loader.cpp

@@ -37,6 +37,7 @@ ResourceLoader::~ResourceLoader()
 {
 {
 	_exit = true;
 	_exit = true;
 	_requests_condition.signal(); // Spurious wake to exit thread
 	_requests_condition.signal(); // Spurious wake to exit thread
+	_thread.stop();
 }
 }
 
 
 void ResourceLoader::add_request(const ResourceRequest& rr)
 void ResourceLoader::add_request(const ResourceRequest& rr)